Skip to content

Commit

Permalink
pkg/kamailio/deb: fix systemd warning for PIDFILE
Browse files Browse the repository at this point in the history
---
systemd[1]: [/etc/systemd/system/kamailio.service:15] Not an absolute path, ignoring: ${PIDFILE}
---

Environment variables are only evaluated for ExecXXX [0]

Remove ExecStopPost, when Type=forking systemd already knows what to do

[0] http://lists.freedesktop.org/archives/systemd-devel/2013-April/010598.html
  • Loading branch information
linuxmaniac committed Nov 4, 2015
1 parent a58d2c9 commit 2874fdd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 16 deletions.
7 changes: 3 additions & 4 deletions pkg/kamailio/deb/debian/kamailio.service
Expand Up @@ -4,18 +4,17 @@ After=syslog.target network.target

[Service]
Type=forking
Environment='PIDFILE=/var/run/kamailio/kamailio.pid'
Environment='CFGFILE=/etc/kamailio/kamailio.cfg'
Environment='SHM_MEMORY=64'
Environment='PKG_MEMORY=8'
Environment='USER=kamailio'
Environment='GROUP=kamailio'
EnvironmentFile=-/etc/default/kamailio
EnvironmentFile=-/etc/default/kamailio.d/*
PIDFile=$PIDFILE
# PIDFile requires a full absolute path
PIDFile=/var/run/kamailio/kamailio.pid
# ExecStart requires a full absolute path
ExecStart=/usr/sbin/kamailio -P $PIDFILE -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
ExecStopPost=/bin/rm -f $PIDFILE
ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
Restart=on-abort

[Install]
Expand Down
7 changes: 3 additions & 4 deletions pkg/kamailio/deb/jessie/kamailio.service
Expand Up @@ -4,18 +4,17 @@ After=syslog.target network.target

[Service]
Type=forking
Environment='PIDFILE=/var/run/kamailio/kamailio.pid'
Environment='CFGFILE=/etc/kamailio/kamailio.cfg'
Environment='SHM_MEMORY=64'
Environment='PKG_MEMORY=8'
Environment='USER=kamailio'
Environment='GROUP=kamailio'
EnvironmentFile=-/etc/default/kamailio
EnvironmentFile=-/etc/default/kamailio.d/*
PIDFile=$PIDFILE
# PIDFile requires a full absolute path
PIDFile=/var/run/kamailio/kamailio.pid
# ExecStart requires a full absolute path
ExecStart=/usr/sbin/kamailio -P $PIDFILE -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
ExecStopPost=/bin/rm -f $PIDFILE
ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
Restart=on-abort

[Install]
Expand Down
7 changes: 3 additions & 4 deletions pkg/kamailio/deb/sid/kamailio.service
Expand Up @@ -4,18 +4,17 @@ After=syslog.target network.target

[Service]
Type=forking
Environment='PIDFILE=/var/run/kamailio/kamailio.pid'
Environment='CFGFILE=/etc/kamailio/kamailio.cfg'
Environment='SHM_MEMORY=64'
Environment='PKG_MEMORY=8'
Environment='USER=kamailio'
Environment='GROUP=kamailio'
EnvironmentFile=-/etc/default/kamailio
EnvironmentFile=-/etc/default/kamailio.d/*
PIDFile=$PIDFILE
# PIDFile requires a full absolute path
PIDFile=/var/run/kamailio/kamailio.pid
# ExecStart requires a full absolute path
ExecStart=/usr/sbin/kamailio -P $PIDFILE -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
ExecStopPost=/bin/rm -f $PIDFILE
ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
Restart=on-abort

[Install]
Expand Down
7 changes: 3 additions & 4 deletions pkg/kamailio/deb/stretch/kamailio.service
Expand Up @@ -4,18 +4,17 @@ After=syslog.target network.target

[Service]
Type=forking
Environment='PIDFILE=/var/run/kamailio/kamailio.pid'
Environment='CFGFILE=/etc/kamailio/kamailio.cfg'
Environment='SHM_MEMORY=64'
Environment='PKG_MEMORY=8'
Environment='USER=kamailio'
Environment='GROUP=kamailio'
EnvironmentFile=-/etc/default/kamailio
EnvironmentFile=-/etc/default/kamailio.d/*
PIDFile=$PIDFILE
# PIDFile requires a full absolute path
PIDFile=/var/run/kamailio/kamailio.pid
# ExecStart requires a full absolute path
ExecStart=/usr/sbin/kamailio -P $PIDFILE -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
ExecStopPost=/bin/rm -f $PIDFILE
ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP
Restart=on-abort

[Install]
Expand Down

0 comments on commit 2874fdd

Please sign in to comment.