fix init-script-builder
dont hardcode apache group name when setting permissions for state dir
Merge pull request #19 from MarcWeber/fixes/apache-dont-hardcode-group

dont hardcode apache group name when setting permissions for state dir
ClamAV: package virus fingerprint database updater.
Use ext4 for VirtualBox images
renaming all occurrences of /var/run/{booted,current}-system

in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
modules/services/web-servers/apache-httpd: make this module more configurable

 - The new option 'apacheHttpd' determines the version of the Apache
   HTTP Server that's being used by this module. The default version
   is Apache 2.2.x, as before.

 - The new option 'configFile' allows users specify their own custom
   config file for the web server instead of being limited to the one
   that this module generates.
modules/services/web-servers/apache-httpd: add apache user to the apache group
modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
Merge pull request #17 from MarcWeber/fix-init-script-builder

fix init-script-builder
Merge commit 'refs/top-bases/experimental/minimal-install-archive' into experimental/minimal-install-archive

* commit 'refs/top-bases/experimental/minimal-install-archive':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder
Merge branch 'experimental/minimal-install-archive' into refs/top-bases/experimental/marc

* experimental/minimal-install-archive:
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder

Conflicts:
	modules/misc/ids.nix
	modules/services/web-servers/apache-httpd/default.nix
Merge commit 'refs/top-bases/experimental/multi-shell-support' into experimental/multi-shell-support

* commit 'refs/top-bases/experimental/multi-shell-support':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder
Merge branch 'experimental/multi-shell-support' into refs/top-bases/experimental/marc

* experimental/multi-shell-support:
Merge commit 'refs/top-bases/experimental/php' into experimental/php

* commit 'refs/top-bases/experimental/php':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder

Conflicts:
	modules/services/web-servers/apache-httpd/default.nix
Merge commit 'refs/top-bases/experimental/postfix' into experimental/postfix

* commit 'refs/top-bases/experimental/postfix':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
Merge branch 'experimental/postfix' into refs/top-bases/experimental/marc

* experimental/postfix:
Merge commit 'refs/top-bases/experimental/firebird' into experimental/firebird

* commit 'refs/top-bases/experimental/firebird':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder

Conflicts:
	modules/misc/ids.nix
Merge commit 'refs/top-bases/experimental/nginx' into experimental/nginx

* commit 'refs/top-bases/experimental/nginx':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder