]> granicus.if.org Git - icinga2/commit
Unify resources for SysV-Init and systemd.
authorGerd von Egidy <gerd@egidy.de>
Sun, 18 May 2014 20:47:27 +0000 (22:47 +0200)
committerGerd von Egidy <gerd@egidy.de>
Sun, 15 Jun 2014 13:49:13 +0000 (15:49 +0200)
commitef4965847413f9fb2f3154e52e69cd8e1c4ea8f1
tree250232c3d2f339988fffc209c8cfcb1206c1f9cf
parent59a1a133c3238c1d23c2efd8eb041383e0cdfcb5
Unify resources for SysV-Init and systemd.

- Move system-specific defines like paths and usernames to /etc/icinga2/sysdefines.conf
  Do not use /etc/sysconfig for this as per suggestion on the systemd mailinglist: it is RedHat-specific
- Use /etc/icinga2/sysdefines.conf in SysV-Init and systemd
- Move both the sources of the SysV-Initscript and the systemd-service definition to etc/initsystem

Refs #4794

Conflicts:
etc/initsystem/icinga2.init.d.cmake
etc/CMakeLists.txt
etc/icinga2/sysdefines.conf.cmake [moved from etc/systemd/icinga2.sysconfig.cmake with 67% similarity]
etc/initsystem/icinga2.init.d.cmake [moved from etc/init.d/icinga2.cmake with 88% similarity]
etc/initsystem/icinga2.service.cmake [moved from etc/systemd/icinga2.service.cmake with 88% similarity]