firebird service
many suggestions contributed by bjornfor and edolstra
Merge pull request #209 from MarcWeber/submit/firebird

systemd/firebird
Remove the nixos.unstable job from the trunk-combined jobset
fix everything Eelco proposed at github
Properly wipe .compose-cache.
Fixes #267.
add simple rsnapshot module
implement bjornfors comments
rsnapshot: extraConfiguration -> extraConfig
rsnapshot: do not use /etc/rsnapshot.conf
Merge pull request #270 from aristidb/master

Add simple rsnapshot module
temporary fix
Merge branch 'systemd/multi-shell-support' into refs/top-bases/systemd/marc

* systemd/multi-shell-support:
  temporary fix
Merge branch 'systemd/firebird' into refs/top-bases/systemd/marc

* systemd/firebird:
  fix everything Eelco proposed at github
Merge commit 'refs/top-bases/systemd/marc' into systemd/marc

* commit 'refs/top-bases/systemd/marc':
  temporary fix
  fix everything Eelco proposed at github
Merge commit 'refs/top-bases/systemd/multi-shell-support' into systemd/multi-shell-support

* commit 'refs/top-bases/systemd/multi-shell-support':
  rsnapshot: do not use /etc/rsnapshot.conf
  rsnapshot: extraConfiguration -> extraConfig
  implement bjornfors comments
  add simple rsnapshot module
  Properly wipe .compose-cache. Fixes #267.
  Remove the nixos.unstable job from the trunk-combined jobset
  firebird service many suggestions contributed by bjornfor and edolstra
Merge branch 'systemd/multi-shell-support' into refs/top-bases/systemd/marc

* systemd/multi-shell-support:
  rsnapshot: do not use /etc/rsnapshot.conf
  rsnapshot: extraConfiguration -> extraConfig
  implement bjornfors comments
  add simple rsnapshot module
  Properly wipe .compose-cache. Fixes #267.
  Remove the nixos.unstable job from the trunk-combined jobset
  firebird service many suggestions contributed by bjornfor and edolstra

Conflicts:
	modules/services/databases/firebird.nix
Merge commit 'refs/top-bases/systemd/virtualbox-server' into systemd/virtualbox-server

* commit 'refs/top-bases/systemd/virtualbox-server':
  rsnapshot: do not use /etc/rsnapshot.conf
  rsnapshot: extraConfiguration -> extraConfig
  implement bjornfors comments
  add simple rsnapshot module
  Properly wipe .compose-cache. Fixes #267.
  Remove the nixos.unstable job from the trunk-combined jobset
  firebird service many suggestions contributed by bjornfor and edolstra
Merge commit 'refs/top-bases/experimental/minimal-install-archive' into experimental/minimal-install-archive

* commit 'refs/top-bases/experimental/minimal-install-archive':
  rsnapshot: do not use /etc/rsnapshot.conf
  rsnapshot: extraConfiguration -> extraConfig
  implement bjornfors comments
  add simple rsnapshot module
  Properly wipe .compose-cache. Fixes #267.
  Remove the nixos.unstable job from the trunk-combined jobset
  firebird service many suggestions contributed by bjornfor and edolstra
Merge branch 'systemd/virtualbox-server' into refs/top-bases/systemd/marc

* systemd/virtualbox-server:
Merge commit 'refs/top-bases/systemd/php-fpm' into systemd/php-fpm

* commit 'refs/top-bases/systemd/php-fpm':
  rsnapshot: do not use /etc/rsnapshot.conf
  rsnapshot: extraConfiguration -> extraConfig
  implement bjornfors comments
  add simple rsnapshot module
  Properly wipe .compose-cache. Fixes #267.
  Remove the nixos.unstable job from the trunk-combined jobset
  firebird service many suggestions contributed by bjornfor and edolstra