diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-04 09:52:06 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-04 09:52:06 -0400 |
| commit | 27fe40a049711305645c3738555cee86a01b02e9 (patch) | |
| tree | 0115ae9be304df03124adddb46b935de72f8207b | |
| parent | d95cfdcf909debe6188996be92521331a0d3b6ae (diff) | |
| download | bcfg2-27fe40a049711305645c3738555cee86a01b02e9.tar.gz bcfg2-27fe40a049711305645c3738555cee86a01b02e9.tar.bz2 bcfg2-27fe40a049711305645c3738555cee86a01b02e9.zip | |
changed default pidfile location in init scripts to allow easier privilege dropping
| -rwxr-xr-x[-rw-r--r--] | debian/bcfg2-server.init | 2 | ||||
| -rw-r--r-- | gentoo/files/bcfg2-server.rc | 20 | ||||
| -rwxr-xr-x | redhat/scripts/bcfg2-server.init | 2 | ||||
| -rw-r--r-- | redhat/systemd/bcfg2-server.service | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init index f2b1161e9..a1fa65d14 100644..100755 --- a/debian/bcfg2-server.init +++ b/debian/bcfg2-server.init @@ -21,7 +21,7 @@ # Commonly used stuff DAEMON=/usr/sbin/bcfg2-server -PIDFILE=/var/run/bcfg2-server.pid +PIDFILE=/var/run/bcfg2-server/bcfg2-server.pid PARAMS="-D $PIDFILE" # Disabled per default diff --git a/gentoo/files/bcfg2-server.rc b/gentoo/files/bcfg2-server.rc index 14f0119ac..7aeda1dc7 100644 --- a/gentoo/files/bcfg2-server.rc +++ b/gentoo/files/bcfg2-server.rc @@ -4,19 +4,21 @@ # depend () { - need net + need net } start () { - ebegin "Starting bcfg2-server" - start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \ - --startas /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid - eend $? "Failed to start bcfg2-server" + ebegin "Starting bcfg2-server" + start-stop-daemon --start --quiet \ + --pidfile /var/run/bcfg2-server/bcfg2-server.pid \ + --startas /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid + eend $? "Failed to start bcfg2-server" } stop () { - ebegin "Stopping bcfg2-server" - start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \ - --signal INT - eend $? "Failed to stop bcfg2-server" + ebegin "Stopping bcfg2-server" + start-stop-daemon --stop --quiet \ + --pidfile /var/run/bcfg2-server/bcfg2-server.pid \ + --signal INT + eend $? "Failed to stop bcfg2-server" } diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init index 8fcaf5f90..ffac6ac3d 100755 --- a/redhat/scripts/bcfg2-server.init +++ b/redhat/scripts/bcfg2-server.init @@ -9,7 +9,7 @@ # to clients. DAEMON=/usr/sbin/bcfg2-server -PIDFILE=/var/run/bcfg2-server.pid +PIDFILE=/var/run/bcfg2-server/bcfg2-server.pid PARAMS="-D $PIDFILE" prog=$(basename $DAEMON) conf="/etc/bcfg2.conf" diff --git a/redhat/systemd/bcfg2-server.service b/redhat/systemd/bcfg2-server.service index 1fd035fcb..43788f215 100644 --- a/redhat/systemd/bcfg2-server.service +++ b/redhat/systemd/bcfg2-server.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking StandardOutput=syslog StandardError=syslog -EnvironmentFile=-/etc/sysconfig/bcfg2 +EnvironmentFile=-/etc/sysconfig/bcfg2-server ExecStart=/usr/sbin/bcfg2-server $OPTIONS [Install] |