Skip to content

Harmonize systemd service config #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 6 commits into from
Jan 28, 2026
Merged

Harmonize systemd service config #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a528e0
Harmonize systemd service config on RPM/Deb
adamdickmeiss Jan 28, 2026
6eafaf1
Fixes
adamdickmeiss Jan 28, 2026
df9a1e3
Update rpm/metaproxy.sysconfig
adamdickmeiss Jan 28, 2026
816c13a
mention metaproxy.user
adamdickmeiss Jan 28, 2026
38c45ea
Mention service
adamdickmeiss Jan 28, 2026
bb905d2
Update rpm/metaproxy.sysconfig
adamdickmeiss Jan 28, 2026
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
8 changes: 0 additions & 8 deletions debian/metaproxy.default
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions debian/metaproxy.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
etc/metaproxy/metaproxy.xml
etc/metaproxy/metaproxy.user
etc/default/metaproxy
usr/bin/metaproxy
usr/share/man/man1/metaproxy.1
usr/share/man/man3/*
Expand Down
2 changes: 1 addition & 1 deletion debian/metaproxy.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

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

# remove old init.d script if existing
if [ -f /etc/init.d/metaproxy ]; then
Expand Down
1 change: 1 addition & 0 deletions debian/metaproxy.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ After=network.target

[Service]
Type=exec
EnvironmentFile=/etc/metaproxy/metaproxy.user
EnvironmentFile=/etc/default/metaproxy
Restart=on-abort
KillMode=process
Expand Down
3 changes: 3 additions & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ 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
mkdir -p debian/tmp/etc/default
cp rpm/metaproxy.sysconfig debian/tmp/etc/default/metaproxy

override_dh_makeshlibs:
dh_makeshlibs -V 'libmetaproxy6 (>= 1.12.0)'
Expand Down
6 changes: 3 additions & 3 deletions rpm/metaproxy.sysconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Defaults for metaproxy
OPTIONS="-u $SERVER_USER -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"
# The following options should not be set, because init.d script
# already sets them: -p, -D, -t
# SERVER_USER is defined in /etc/metaproxy/metaproxy.user
# Options used for starting metaproxy in metaproxy.service
OPTIONS="-u ${SERVER_USER} -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"