- gerrit-log - lists.osmocom.org

[S] Change in osmo-ggsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-ggsn
by osmith 16 May '24

16 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36841?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-ggsn ...................................................................... doc: set state-dir to /var/lib/osmocom/osmo-ggsn Prepare to run osmo-ggsn as user with the systemd service. As with other Osmocom service files, we will set StateDirectory= and WorkingDirectory= options. This results in osmo-ggsn only being able to write to /var/lib/osmocom, therefore let's change the state-dir from /tmp to /var/lib/osmocom/osmo-ggsn to avoid: gsn.c:411 fopen(path=/tmp/gsn_restart, mode=w) failed: Error = Permission denied Having the state in /var/lib/osmocom also makes more sense, because then it doesn't get deleted on reboot. Change-Id: I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a --- M doc/examples/osmo-ggsn-kernel-gtp.cfg M doc/examples/osmo-ggsn.cfg M doc/manuals/chapters/configuration.adoc 3 files changed, 24 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/examples/osmo-ggsn-kernel-gtp.cfg b/doc/examples/osmo-ggsn-kernel-gtp.cfg index 28eb207..12da4f8 100644 --- a/doc/examples/osmo-ggsn-kernel-gtp.cfg +++ b/doc/examples/osmo-ggsn-kernel-gtp.cfg @@ -36,7 +36,7 @@ no login ! ggsn ggsn0 - gtp state-dir /tmp + gtp state-dir /var/lib/osmocom/osmo-ggsn gtp bind-ip 127.0.0.2 apn internet gtpu-mode kernel-gtp diff --git a/doc/examples/osmo-ggsn.cfg b/doc/examples/osmo-ggsn.cfg index 02523e9..76fa257 100644 --- a/doc/examples/osmo-ggsn.cfg +++ b/doc/examples/osmo-ggsn.cfg @@ -36,7 +36,7 @@ no login ! ggsn ggsn0 - gtp state-dir /tmp + gtp state-dir /var/lib/osmocom/osmo-ggsn gtp bind-ip 127.0.0.2 apn internet gtpu-mode tun diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 5314d10..f0889d3 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -16,7 +16,7 @@ .Example: Single GGSN configuration section ---- ggsn ggsn0 - gtp state-dir /tmp + gtp state-dir /var/lib/osmocom/osmo-ggsn gtp bind-ip 127.0.0.6 apn internet gtpu-mode tun @@ -58,7 +58,7 @@ for every GGSN instance: ---- -OsmoGGSN(config-ggsn)# gtp state-dir /var/lib/ggsn/ggsn0 <1> +OsmoGGSN(config-ggsn)# gtp state-dir /var/lib/osmocom/osmo-ggsn <1> OsmoGGSN(config-ggsn)# gtp bind-ip 127.0.0.6 <2> ---- <1> Store the GSN restart state in the specified directory -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a Gerrit-Change-Number: 36841 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ggsn[master]: contrib/systemd: run as osmocom user
by osmith 16 May '24

16 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29412?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... contrib/systemd: run as osmocom user Related: OS#4107 Change-Id: I915f2fc12d0bd905d24636aacb2760a6b72a55e3 --- M contrib/systemd/osmo-ggsn.service A debian/postinst 2 files changed, 53 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/contrib/systemd/osmo-ggsn.service b/contrib/systemd/osmo-ggsn.service index 1a7acba..cf7b7e6 100644 --- a/contrib/systemd/osmo-ggsn.service +++ b/contrib/systemd/osmo-ggsn.service @@ -11,6 +11,10 @@ ExecStart=/usr/bin/osmo-ggsn -c /etc/osmocom/osmo-ggsn.cfg RestartSec=2 RestartPreventExitStatus=1 +User=osmocom +Group=osmocom +# For setting up the gtp0/tun0 devices +AmbientCapabilities=CAP_NET_ADMIN [Install] WantedBy=multi-user.target diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 0000000..9cd0c77 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,39 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + if dpkg --compare-versions "$2" le "1.13.0"; then + if [ -e /etc/osmocom/osmo-ggsn.cfg ]; then + chown -v osmocom:osmocom /etc/osmocom/osmo-ggsn.cfg + chmod -v 0660 /etc/osmocom/osmo-ggsn.cfg + fi + + if [ -d /etc/osmocom ]; then + chown -v root:osmocom /etc/osmocom + chmod -v 2775 /etc/osmocom + fi + + mkdir -p /var/lib/osmocom + chown -R -v osmocom:osmocom /var/lib/osmocom + fi + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# + -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29412?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I915f2fc12d0bd905d24636aacb2760a6b72a55e3 Gerrit-Change-Number: 29412 Gerrit-PatchSet: 17 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ggsn[master]: ggsn/ggsn_vty: create state-dir
by osmith 16 May '24

16 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36840?usp=email ) Change subject: ggsn/ggsn_vty: create state-dir ...................................................................... ggsn/ggsn_vty: create state-dir Prepare to change the state-dir in the default config in a follow-up commit. Create the directory if it does not exist. Change-Id: I91349fb284336a9de6af41475f1b824eb0e021b0 --- M ggsn/ggsn_vty.c 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index f70daf1..da67591 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -22,6 +22,8 @@ #include <inttypes.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <sys/stat.h> +#include <sys/types.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> @@ -224,6 +226,11 @@ { struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; + if (mkdir(argv[0], 0755) == -1 && errno != EEXIST) { + vty_out(vty, "%% Failed to create state-dir: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + osmo_talloc_replace_string(ggsn, &ggsn->cfg.state_dir, argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36840?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I91349fb284336a9de6af41475f1b824eb0e021b0 Gerrit-Change-Number: 36840 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ggsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-ggsn
by osmith 16 May '24

16 May '24

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36841?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-ggsn ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Likewise, I think we need to update default dir for osmo-sgsn too. -> https://gerrit.osmocom.org/c/osmo-sgsn/+/36845 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a Gerrit-Change-Number: 36841 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 May 2024 08:59:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ggsn[master]: ggsn/ggsn_vty: create state-dir
by osmith 16 May '24

16 May '24

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36840?usp=email ) Change subject: ggsn/ggsn_vty: create state-dir ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > osmo-sgsn has a similar command `cfg_sgsn_state_dir_cmd`, I think we should also patch it? -> https://gerrit.osmocom.org/c/osmo-sgsn/+/36844 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36840?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I91349fb284336a9de6af41475f1b824eb0e021b0 Gerrit-Change-Number: 36840 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 May 2024 08:58:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-sgsn[master]: sgsn/sgsn_vty: create state-dir
by osmith 16 May '24

16 May '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36844?usp=email ) Change subject: sgsn/sgsn_vty: create state-dir ...................................................................... sgsn/sgsn_vty: create state-dir Prepare to change the state-dir in the default config in a follow-up commit. Create the directory if it does not exist. Change-Id: I8db4898cdaa2fcbd6bbf7c543764b9cdf828de83 --- M src/sgsn/sgsn_vty.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/36844/1 diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 6837e71..6ca5a7d 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -24,6 +24,8 @@ #include <arpa/inet.h> #include <time.h> #include <inttypes.h> +#include <sys/stat.h> +#include <sys/types.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> @@ -404,6 +406,11 @@ "Set the directory for the GTP State file\n" "Local Directory\n") { + if (mkdir(argv[0], 0755) == -1 && errno != EEXIST) { + vty_out(vty, "%% Failed to create state-dir: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + osmo_talloc_replace_string(sgsn, &sgsn->cfg.gtp_statedir, argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36844?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8db4898cdaa2fcbd6bbf7c543764b9cdf828de83 Gerrit-Change-Number: 36844 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
by osmith 16 May '24

16 May '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn ...................................................................... doc: set state-dir to /var/lib/osmocom/osmo-sgsn Be consistent with osmo-ggsn, and set the state dir to /var/lib/osmocom/osmo-sgsn. Without this patch, it defaults to the current directory, which means in case of running with the systemd service, /var/lib/osmocom. Related: osmo-ggsn I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 --- M doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg M doc/examples/osmo-sgsn/osmo-sgsn.cfg M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg 3 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/45/36845/1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg index 69000b4..9bc1520 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg @@ -14,6 +14,7 @@ no login ! sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 0b5ef4b..8104725 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -14,6 +14,7 @@ no login ! sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg index a7ed9cf..d7fbd75 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -23,6 +23,7 @@ asp asp-clnt-OsmoSGSN-A routing-key 3 0.23.4 sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-ggsn[master]: {contrib,debian}/osmo-ggsn.init: remove
by fixeria 16 May '24

16 May '24

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36843?usp=email ) Change subject: {contrib,debian}/osmo-ggsn.init: remove ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36843?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I11bfb5122344b54970b7f742470cb74b95fa37e0 Gerrit-Change-Number: 36843 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 16 May 2024 08:48:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ggsn[master]: Use uniform log format for default config files
by fixeria 16 May '24

16 May '24

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36842?usp=email ) Change subject: Use uniform log format for default config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36842?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I272767e029e95b64f2525d4f19efdfa1f0e29ca2 Gerrit-Change-Number: 36842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 May 2024 08:46:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ggsn[master]: contrib/systemd: run as osmocom user
by fixeria 16 May '24

16 May '24

Attention is currently required from: lynxis lazus, msuraev, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29412?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... Patch Set 16: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29412?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I915f2fc12d0bd905d24636aacb2760a6b72a55e3 Gerrit-Change-Number: 29412 Gerrit-PatchSet: 16 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 16 May 2024 08:46:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log