Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions debian/metaproxy.default
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Defaults for metaproxy initscript
# sourced by /etc/init.d/metaproxy
# installed at /etc/default/metaproxy by the maintainer scripts

#
# This is a POSIX shell fragment
#

# Additional options that are passed to the Daemon.
DAEMON_OPTS="-D -u $SERVER_USER -p /var/run/metaproxy.pid -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"
# Metaproxy user information
SERVER_HOME=/var/lib/metaproxy
SERVER_USER=metaproxy
SERVER_NAME="Metaproxy user"
SERVER_GROUP=metaproxy
# Options passed in metaproxy.service
# Do *not* use -D unless changing Type=fork
OPTIONS="-u ${SERVER_USER} -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"
180 changes: 0 additions & 180 deletions debian/metaproxy.init

This file was deleted.

1 change: 0 additions & 1 deletion debian/metaproxy.install
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
etc/metaproxy/metaproxy.xml
etc/metaproxy/metaproxy.user
usr/bin/metaproxy
usr/share/man/man1/metaproxy.1
usr/share/man/man3/*
Expand Down
4 changes: 2 additions & 2 deletions debian/metaproxy.logrotate
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
delaycompress
notifempty
postrotate
if [ -f /var/run/metaproxy.pid ]; then
kill -HUP `cat /var/run/metaproxy.pid`
if [ -d /run/systemd/system ]; then
/usr/bin/systemctl try-reload-or-restart metaproxy.service
fi
endscript
create 644 metaproxy root
Expand Down
46 changes: 33 additions & 13 deletions debian/metaproxy.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ set -e

case "$1" in
configure)
. /etc/metaproxy/metaproxy.user

# 1. create group if not existing
. /etc/default/metaproxy

# remove old init.d script if existing
if [ -f /etc/init.d/metaproxy ]; then
rm -f /etc/init.d/metaproxy
fi
# create group if not existing
if ! getent group | grep -q "^$SERVER_GROUP:" ; then
echo -n "Adding group $SERVER_GROUP.."
addgroup --quiet --system $SERVER_GROUP 2>/dev/null ||true
echo "..done"
fi
# 2. create homedir if not existing
# create homedir if not existing
test -d $SERVER_HOME || mkdir $SERVER_HOME

# 3. create user if not existing
# create user if not existing
if ! getent passwd | grep -q "^$SERVER_USER:"; then
echo -n "Adding system user $SERVER_USER.."
adduser --quiet \
Expand All @@ -26,23 +30,39 @@ case "$1" in
$SERVER_USER 2>/dev/null || true
echo "..done"
fi
# 4. adjust passwd entry
# adjust passwd entry
usermod -c "$SERVER_NAME" \
-d $SERVER_HOME \
-g $SERVER_GROUP \
$SERVER_USER
# 5. adjust file and directory permissions

# adjust file and directory permissions
if ! dpkg-statoverride --list $SERVER_HOME >/dev/null
then
chown -R $SERVER_USER:adm $SERVER_HOME
chmod u=rwx,g=rxs,o= $SERVER_HOME
fi

# 6. start service
if [ -x "/etc/init.d/metaproxy" ]; then
update-rc.d metaproxy defaults >/dev/null
invoke-rc.d metaproxy start || exit $?
# reload systemd daemon if systemd is used
if [ -d /run/systemd/system ]; then
systemctl daemon-reload || true
fi
;;
esac

# Automatically added by dh_installsystemd/13.24.2
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
# The following line should be removed in trixie or trixie+1
deb-systemd-helper unmask 'metaproxy.service' >/dev/null || true

# was-enabled defaults to true, so new installations run enable.
if deb-systemd-helper --quiet was-enabled 'metaproxy.service'; then
# Enables the unit on first installation, creates new
# symlinks on upgrades if the unit file has changed.
deb-systemd-helper enable 'metaproxy.service' >/dev/null || true
else
# Update the statefile to add new symlinks (if any), which need to be
# cleaned up on purge. Also remove old symlinks.
deb-systemd-helper update-state 'metaproxy.service' >/dev/null || true
fi
fi
# End automatically added section
6 changes: 1 addition & 5 deletions debian/metaproxy.postrm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ set -e

case "$1" in
purge)
update-rc.d metaproxy remove >/dev/null

# copy of metaproxy.user, which is gone at this point
SERVER_HOME=/var/metaproxy
# delete the orignal user
SERVER_USER=metaproxy
SERVER_NAME="Metaproxy user"
SERVER_GROUP=metaproxy

# find first and last SYSTEM_UID numbers
Expand Down
8 changes: 4 additions & 4 deletions debian/metaproxy.prerm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
set -e
if [ -x "/etc/init.d/metaproxy" ]; then
invoke-rc.d metaproxy stop || exit $?
# Automatically added by dh_installsystemd/13.24.2
if [ -z "$DPKG_ROOT" ] && [ "$1" = remove ] && [ -d /run/systemd/system ] ; then
deb-systemd-invoke stop 'metaproxy.service' >/dev/null || true
fi
# End automatically added section
17 changes: 17 additions & 0 deletions debian/metaproxy.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Metaproxy systemd-style configuration

[Unit]
Description=Metaproxy Z39.50/SRU router
Documentation=man:metaproxy(1)
After=network.target

[Service]
Type=exec
EnvironmentFile=/etc/default/metaproxy
Restart=on-abort
KillMode=process
ExecStart=/bin/sh -c "exec /usr/bin/metaproxy ${OPTIONS}"
ExecReload=kill -HUP $MAINPID

[Install]
WantedBy=multi-user.target
4 changes: 3 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ override_dh_auto_install:
mv debian/tmp/usr/share/doc/metaproxy debian/tmp/usr/share/doc/metaproxy-doc
mkdir -p debian/tmp/etc/metaproxy
cp debian/metaproxy.xml debian/tmp/etc/metaproxy/metaproxy.xml
cp rpm/metaproxy.user debian/tmp/etc/metaproxy/metaproxy.user

override_dh_makeshlibs:
dh_makeshlibs -V 'libmetaproxy6 (>= 1.12.0)'
Expand All @@ -28,3 +27,6 @@ override_dh_installchangelogs:

override_dh_installdocs:
dh_installdocs -A README.md

override_dh_installsystemd:
dh_installsystemd