pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36022?usp=email ) Change subject: debian: Fixes in systemd service ...................................................................... debian: Fixes in systemd service Update the osmo-epdg.service file to point to proper directories. Patch installed config file so that the libdir points to the dir where libraries were installed. Change-Id: Icd640d517b33a840d73aaabef9c594541848357a --- D contrib/osmo-epdg.service M contrib/systemd/osmo-epdg.service A debian/osmo-epdg.dirs M debian/osmo-epdg.install M debian/rules 5 files changed, 28 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/22/36022/1 diff --git a/contrib/osmo-epdg.service b/contrib/osmo-epdg.service deleted file mode 100644 index bfa8293..0000000 --- a/contrib/osmo-epdg.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Osmocom ePDG (Evolved Packet Data Gateway) -After=network-online.target -Wants=network-online.target - -[Service] -Type=simple -Restart=always -Environment="HOME=/var/lib/osmo-epdg" -ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg -ExecStart=/usr/bin/osmo-epdg -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-epdg.service b/contrib/systemd/osmo-epdg.service index a62a972..95ce43f 100644 --- a/contrib/systemd/osmo-epdg.service +++ b/contrib/systemd/osmo-epdg.service @@ -1,13 +1,14 @@ [Unit] -Description=Osmocom DIAMETER to GSUP translator -After=osmo-hlr.service +Description=Osmocom ePDG (Evolved Packet Data Gateway) After=network-online.target Wants=network-online.target [Service] Type=simple Restart=always -Environment="HOME=/var/lib/osmo-epdg" +WorkingDirectory=/var/lib/osmo-epdg +Environment="ERL_FLAGS=-config /etc/osmocom/osmo-epdg/osmo-epdg.config" +ExecStartPre=-/usr/bin/ip link del gtp0 ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg ExecStart=/usr/bin/osmo-epdg RestartSec=2 diff --git a/debian/osmo-epdg.dirs b/debian/osmo-epdg.dirs new file mode 100644 index 0000000..563b7ec --- /dev/null +++ b/debian/osmo-epdg.dirs @@ -0,0 +1 @@ +/var/lib/osmo-epdg diff --git a/debian/osmo-epdg.install b/debian/osmo-epdg.install index 62aec37..f74f71b 100644 --- a/debian/osmo-epdg.install +++ b/debian/osmo-epdg.install @@ -1,3 +1,4 @@ +/etc/osmocom/osmo-epdg/osmo-epdg.config /etc/osmocom/osmo-epdg/ /contrib/systemd/osmo-epdg.service /lib/systemd/system/ /_build/default/bin/osmo-epdg /usr/bin/ -/_build/default/lib/gen_socket/priv/lib/gen_socket*.so /usr/lib/${DEB_HOST_MULTIARCH}/ +/_build/default/lib/gen_socket/priv/lib/gen_socket*.so /usr/lib/ diff --git a/debian/rules b/debian/rules index 55115ce..cf84877 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,13 @@ cp _checkouts/gen_socket/priv/lib/gen_socket*.so ./_build/default/lib/gen_socket/priv/lib/; \ fi +override_dh_install: + install -d debian/tmp/etc/osmocom/osmo-epdg/ + install -m 755 config/sys.config debian/tmp/etc/osmocom/osmo-epdg/osmo-epdg.config + sed -i 's#_build/default/lib/gen_socket/priv/lib#/usr/lib/#g' \ + debian/tmp/etc/osmocom/osmo-epdg/osmo-epdg.config + dh_install + override_dh_clean: dh_clean rm -rf _build _checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36022?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Icd640d517b33a840d73aaabef9c594541848357a Gerrit-Change-Number: 36022 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange