[Openvpn-devel] SystemD user names

Message ID CAH+fs=9t5VvejtnxVFTCS8zVjM54HQaXw_bowXLmnr_r3PDJAg@mail.gmail.com
State Accepted
Headers show
Series [Openvpn-devel] SystemD user names | expand

Commit Message

Marc Leeman Dec. 6, 2024, 9:29 a.m. UTC
David,

cf. att.

Comments

David Sommerseth Dec. 9, 2024, 2:04 p.m. UTC | #1
On 06/12/2024 10:29, Marc Leeman wrote:
> David,
> 
> cf. att.
> 
Thanks a lot!  Patch has been committed.

commit 9a1cf3fae9fb3788e9714d148d9b7efcb5f4c948
Author: Marc Leeman
Date:   Fri Dec 6 10:29:19 2024 +0100

     build: Fix incorrect OPENVPN_USERNAME in D-Bus autostart files
     
     Remove hard coded `openvpn` user in meson files.  The build system
     allows to replace the default `openvpn` user with some other name.
     This works for most services, but during refactoring, 3 hard coded
     references were omitted.
     
     This popped up while packaging for Debian since the system users should
      be prepended with a '_'.
     
     Signed-off-by: Marc Leeman
     Approved-by: David Sommerseth

<https://codeberg.org/OpenVPN/openvpn3-linux/commit/9a1cf3fae9fb3788e9714d148d9b7efcb5f4c948>

Patch

Description: Remove hard coded `openvpn` user in meson files
 The build system allows to replace the default `openvpn` user with
 some other name. This works for most services, but during refactoring,
 3 hard coded references were omitted.
 This popped up while packaging for debian since the system users should
 be prepended with a '_'.
Author: Marc Leeman <marc.leeman@gmail.com>
Forwarded: https://github.com/OpenVPN/openvpn3-linux/issues/193#issuecomment-2522399889
Last-Update: 2024-12-06

Index: openvpn3-client/src/configmgr/meson.build
===================================================================
--- openvpn3-client.orig/src/configmgr/meson.build
+++ openvpn3-client/src/configmgr/meson.build
@@ -45,7 +45,6 @@  configure_file(
             'BUSNAME': 'net.openvpn.v3.configuration',
             'SERVICE_BIN': bin_backend_configmgr.name(),
             'SERVICE_ARGS': '--state-dir "' + openvpn3_statedir + '/configs"',
-            'OPENVPN_USERNAME': 'openvpn',
         }
     ),
     install: true,
Index: openvpn3-client/src/log/meson.build
===================================================================
--- openvpn3-client.orig/src/log/meson.build
+++ openvpn3-client/src/log/meson.build
@@ -44,7 +44,6 @@  configure_file(
             'BUSNAME': 'net.openvpn.v3.log',
             'SERVICE_BIN': bin_backend_log.name(),
             'SERVICE_ARGS': '--state-dir "' + openvpn3_statedir + '"',
-            'OPENVPN_USERNAME': 'openvpn',
         }
     ),
     install: true,
Index: openvpn3-client/src/sessionmgr/meson.build
===================================================================
--- openvpn3-client.orig/src/sessionmgr/meson.build
+++ openvpn3-client/src/sessionmgr/meson.build
@@ -46,7 +46,6 @@  configure_file(
             'BUSNAME': 'net.openvpn.v3.sessions',
             'SERVICE_BIN': bin_backend_sessionmgr.name(),
             'SERVICE_ARGS': '',
-            'OPENVPN_USERNAME': 'openvpn',
         }
     ),
     install: true,