[Python-apps-commits] r13661 - in packages/vrfydmn/trunk/debian (6 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Mon Nov 7 22:51:00 UTC 2016
Date: Monday, November 7, 2016 @ 22:50:58
Author: kitterman
Revision: 13661
* Upload to unstable
* New upstream release
* Update service file to match recent changes in opendkim (which was the
basis for the service file handling in this package)
* Update Vcs-* to use https
Added:
packages/vrfydmn/trunk/debian/vrfydmn.tmpfile
Modified:
packages/vrfydmn/trunk/debian/changelog
packages/vrfydmn/trunk/debian/control
packages/vrfydmn/trunk/debian/vrfydmn.postinst
packages/vrfydmn/trunk/debian/vrfydmn.service
packages/vrfydmn/trunk/debian/vrfydmn.service.generate
Modified: packages/vrfydmn/trunk/debian/changelog
===================================================================
--- packages/vrfydmn/trunk/debian/changelog 2016-11-06 13:39:30 UTC (rev 13660)
+++ packages/vrfydmn/trunk/debian/changelog 2016-11-07 22:50:58 UTC (rev 13661)
@@ -1,3 +1,13 @@
+vrfydmn (0.8.2-1) unstable; urgency=medium
+
+ * Upload to unstable
+ * New upstream release
+ * Update service file to match recent changes in opendkim (which was the
+ basis for the service file handling in this package)
+ * Update Vcs-* to use https
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 07 Nov 2016 17:25:36 -0500
+
vrfydmn (0.7.1-1) experimental; urgency=medium
* Initial release. (Closes: #832086)
Modified: packages/vrfydmn/trunk/debian/control
===================================================================
--- packages/vrfydmn/trunk/debian/control 2016-11-06 13:39:30 UTC (rev 13660)
+++ packages/vrfydmn/trunk/debian/control 2016-11-07 22:50:58 UTC (rev 13661)
@@ -6,8 +6,8 @@
Build-Depends: debhelper (>= 9), python, dh-python, dh-systemd
Standards-Version: 3.9.8
Homepage: https://github.com/croessner/vrfydmn
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/vrfydmn/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/vrfydmn/trunk/
+Vcs-Svn: https://anonscm.debian.org/python-apps/packages/vrfydmn/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/vrfydmn/trunk/
Package: vrfydmn
Architecture: all
Modified: packages/vrfydmn/trunk/debian/vrfydmn.postinst
===================================================================
--- packages/vrfydmn/trunk/debian/vrfydmn.postinst 2016-11-06 13:39:30 UTC (rev 13660)
+++ packages/vrfydmn/trunk/debian/vrfydmn.postinst 2016-11-07 22:50:58 UTC (rev 13661)
@@ -26,7 +26,7 @@
# Create the run directory if it doesn't exist
if [ ! -d "$RUNDIR" ]; then
- install -o "$USER" -g "$GROUP" -m 755 -d "$RUNDIR" || return 2
+ install -o "$USER" -g "$GROUP" -m 755 -d "$RUNDIR" || exit 2
if pathfind restorecon; then restorecon "$RUNDIR"
fi
fi
@@ -35,6 +35,16 @@
if ! dpkg-statoverride --list /var/run/vrfydmn >/dev/null; then
chown vrfydmn:vrfydmn /var/run/vrfydmn
fi
+
+ # Upgrade /etc/default to systemd override files
+ if [ -d /run/systemd/system ] && [ -f /etc/default/vrfydmn ]; then
+ if /lib/opendkim/vrfydmn.service.generate; then
+ rm -f /etc/default/vrfydmn
+ fi
+ if [ -f /etc/tmpfiles.d/vrfydmn.conf ]; then
+ systemd-tmpfiles --create /etc/tmpfiles.d/vrfydmn.conf
+ fi
+ fi
fi
#DEBHELPER#
Modified: packages/vrfydmn/trunk/debian/vrfydmn.service
===================================================================
--- packages/vrfydmn/trunk/debian/vrfydmn.service 2016-11-06 13:39:30 UTC (rev 13660)
+++ packages/vrfydmn/trunk/debian/vrfydmn.service 2016-11-07 22:50:58 UTC (rev 13661)
@@ -15,14 +15,9 @@
[Service]
Type=forking
PIDFile=/var/run/vrfydmn/vrfydmn.pid
-PermissionsStartOnly=true
User=vrfydmn
-Group=vrfydmn
-ExecStartPre=-/bin/sh /lib/vrfydmn/vrfydmn.service.generate
-ExecStartPre=-/bin/mkdir -p /var/run/vrfydmn
-ExecStartPre=-/bin/chown vrfydmn.vrfydmn /var/run/vrfydmn
ExecStart=/usr/sbin/vrfydmn -s local:/var/run/vrfydmn/vrfydmn.sock -u vrfydmn -g vrfydmn -p /var/run/vrfydmn/vrfydmn.pid
-TimeoutStartSec=10
+Restart=on-failure
ExecReload=/bin/kill -USR1 $MAINPID
[Install]
Modified: packages/vrfydmn/trunk/debian/vrfydmn.service.generate
===================================================================
--- packages/vrfydmn/trunk/debian/vrfydmn.service.generate 2016-11-06 13:39:30 UTC (rev 13660)
+++ packages/vrfydmn/trunk/debian/vrfydmn.service.generate 2016-11-07 22:50:58 UTC (rev 13661)
@@ -1,84 +1,61 @@
#! /bin/sh
#
-# Generate systemd service file from /etc/default
-# Copyright 2016 Scott Kitterman
-# All rights reserved.
+# Generate systemd override file from /etc/default
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of the University nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
+set -e
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
NAME=vrfydmn
-# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
-else
RUNDIR=/var/run/$NAME
USER=$NAME
GROUP=$NAME
-# Other package specific defaults can be added for if the defaults file is
-# missing:
SOCKET=local:$RUNDIR/$NAME.sock
-PIDFILE=$RUNDIR/$NAME.pid
+
+_RUNDIR=$RUNDIR
+_USER=$USER
+_GROUP=$GROUP
+_SOCKET=$SOCKET
+
+# Include defaults if available
+if [ -f /etc/default/$NAME ]; then
+ . /etc/default/$NAME
fi
-SERVICEFILE=/lib/$NAME/$NAME.service
-SERVICEFILE=$NAME.service
-# Create the new service file
-echo "# Automatically Generated by $NAME systemd service file generator." > $SERVICEFILE.new
-echo "# To change the editable parameters, edit /etc/default/$NAME and then do" >> $SERVICEFILE.new
-echo "# systemctl restart $NAME." >> $SERVICEFILE.new
-echo "" >> $SERVICEFILE.new
-echo "# If you are using vrfydmn with SQL datasets it might be necessary to start" >> $SERVICEFILE.new
-echo "# vrfydmn after the database servers. For example, if using both MySQL, edit" >> $SERVICEFILE.new
-echo "# /etc/default/$NAME to add the needed definitions to EXTRAAFTER. If used the" >> $SERVICEFILE.new
-echo "# EXTRAAFTER. If used, MySQL service fiel would have to be added." >> $SERVICEFILE.new
-echo "" >> $SERVICEFILE.new
-echo "[Unit]" >> $SERVICEFILE.new
-echo "Description=anti-spoofing milter for Postfix" >> $SERVICEFILE.new
-echo "Documentation=man:vrfydmn(8) man:vrfydmn_ldap(5)" >> $SERVICEFILE.new
-echo "After=network.target nss-lookup.target $EXTRAAFTER" >> $SERVICEFILE.new
-echo "" >> $SERVICEFILE.new
-echo "[Service]" >> $SERVICEFILE.new
-echo "Type=forking" >> $SERVICEFILE.new
-echo "PIDFile=$PIDFILE" >> $SERVICEFILE.new
-echo "PermissionsStartOnly=true" >> $SERVICEFILE.new
-echo "User=$USER" >> $SERVICEFILE.new
-echo "Group=$GROUP" >> $SERVICEFILE.new
-echo "ExecStartPre=-/bin/sh /lib/$NAME/$NAME.service.generate" >> $SERVICEFILE.new
-echo "ExecStartPre=-/bin/mkdir -p $RUNDIR" >> $SERVICEFILE.new
-echo "ExecStartPre=-/bin/chown $USER.$GROUP $RUNDIR" >> $SERVICEFILE.new
-echo "ExecStart=/usr/sbin/$NAME -s $SOCKET $DAEMON_OPTS -u $USER -g $GROUP -p $PIDFILE" >> $SERVICEFILE.new
-echo "TimeoutStartSec=10" >> $SERVICEFILE.new
-echo "ExecReload=/bin/kill -USR1 \$MAINPID" >> $SERVICEFILE.new
-echo "" >> $SERVICEFILE.new
-echo "[Install]" >> $SERVICEFILE.new
-echo "WantedBy=multi-user.target" >> $SERVICEFILE.new
+# Generate service override file
+SERVICE=$(mktemp $NAME.service.XXXXXXXXXX)
-if [ "$(md5sum < /lib/systemd/system/$NAME.service)" != "$(md5sum < $SERVICEFILE.new)" ] ; then
- mv $SERVICEFILE.new /lib/systemd/system/$NAME.service
- systemctl daemon-reload
- systemctl restart $NAME
+if [ "$EXTRAAFTER" != "" ]; then
+ echo "[Unit]" >> $SERVICE
+ echo "After=$EXTRAAFTER" >> $SERVICE
fi
+if [ "$RUNDIR" != "$_RUNDIR" ]; then
+ echo "[Service]" >> $SERVICE
+ echo "PIDFile=$RUNDIR/$NAME.pid" >> $SERVICE
+fi
+if [ "$USER" != "$_USER" ] || [ "$GROUP" != "$_GROUP" ]; then
+ grep -q -F "[Service]" $SERVICE || echo "[Service]" >> $SERVICE
+ echo "User=$USER" >> $SERVICE
+ echo "Group=$GROUP" >> $SERVICE
+fi
+if [ "$SOCKET" != "$_SOCKET" ] || [ "$RUNDIR" != "$_RUNDIR" ] || [ "$DAEMON_OPTS" != "" ]; then
+ grep -q -F "[Service]" $SERVICE || echo "[Service]" >> $SERVICE
+ echo "ExecStart=" >> $SERVICE
+ echo "ExecStart=/usr/sbin/vrfydmn -P $RUNDIR/$NAME.pid -p $SOCKET $DAEMON_OPTS" >> $SERVICE
+fi
+if [ -s $SERVICE ] ; then
+ mkdir -p /etc/systemd/system/$NAME.service.d
+ cp $SERVICE /etc/systemd/system/$NAME.service.d/override.conf
+fi
+
+# Generate tmpfiles.d override file
+TMPFILE=$(mktemp $NAME.tmpfile.XXXXXXXXXX)
+
+echo "d $RUNDIR 0750 $USER $GROUP - -" > $TMPFILE
+
+if ! cmp -s $TMPFILE /usr/lib/tmpfiles.d/vrfydmn.conf; then
+ mkdir -p /etc/tmpfiles.d
+ cp $TMPFILE /etc/tmpfiles.d/$NAME.conf
+fi
+
+rm -f $SERVICE $TMPFILE
Added: packages/vrfydmn/trunk/debian/vrfydmn.tmpfile
===================================================================
--- packages/vrfydmn/trunk/debian/vrfydmn.tmpfile (rev 0)
+++ packages/vrfydmn/trunk/debian/vrfydmn.tmpfile 2016-11-07 22:50:58 UTC (rev 13661)
@@ -0,0 +1 @@
+d /var/run/vrfydmn 0750 vrfydmn vrfydmn - -
More information about the Python-apps-commits
mailing list