Run service as multiflexi user/group

Dependency to adduser added FIXED: listing installed apps in Jenkinsfile
VitexSoftware · May 4, 2024 · 295894d · 295894d
1 parent fcafad2
commit 295894d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/debian/Jenkinsfile b/debian/Jenkinsfile
@@ -61,7 +61,7 @@ distributions.each {
                     sh 'IFS="\n\b"; for package in  `ls $WORKSPACE/dist/debian/ | grep .deb | grep sqlite | awk -F_ \'{print \$1}\'` ; do  echo -e "${GREEN} installing ${package} on `lsb_release -sc` ${ENDCOLOR} " ; sudo  DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug  + ' apt-get -y install $package ; done;'
                     sh '/etc/cron.daily/multiflexi || true'
                     sh 'multiflexi-cli version'
-                    sh 'sudo multiflexi-cli list apps'
+                    sh 'sudo multiflexi-cli list app'
                     stash includes: 'dist/**', name: 'dist-' + distroCodename
                 }
             }

diff --git a/debian/control b/debian/control
@@ -8,7 +8,7 @@ Homepage: https://github.com/VitexSoftware/MultiFlexi
 
 Package: multiflexi
 Multi-Arch: foreign
-Depends: ${misc:Depends}, php-vitexsoftware-ease-bricks, php-vitexsoftware-abraflexi-bricks, php-cli, locales-all, php-vitexsoftware-ease-bootstrap4-widgets-abraflexi ,php-vitexsoftware-ease-fluentpdo, multiflexi-sqlite|multiflexi-mysql|multiflexi-pgsql, libjs-jquery-datatables, libjs-jquery-selectize.js, anacron
+Depends: ${misc:Depends}, php-vitexsoftware-ease-bricks, php-vitexsoftware-abraflexi-bricks, php-cli, locales-all, php-vitexsoftware-ease-bootstrap4-widgets-abraflexi ,php-vitexsoftware-ease-fluentpdo, multiflexi-sqlite|multiflexi-mysql|multiflexi-pgsql, libjs-jquery-datatables, libjs-jquery-selectize.js, anacron, adduser (>= 3.11)
 Suggests: multiflexi-abraflexi-contract-invoices, multiflexi-abraflexi-digest, multiflexi-abraflexi-mailer, multiflexi-abraflexi-matcher, multiflexi-abraflexi-raiffeisenbank, multiflexi-abraflexi-reminder, multiflexi-abraflexi-tools, multiflexi-discomp2abraflexi, multiflexi-podman, multiflexi-pohoda-client-config, multiflexi-realpad2mailkit, multiflexi-redmine2abraflexi
 Pre-Depends: php-robmorgan-phinx|php-cakephp-phinx
 Architecture: all

diff --git a/debian/multiflexi.service b/debian/multiflexi.service
@@ -7,6 +7,8 @@ Description=Run MultiFlexi scheduled jobs
 After=multi-user.target
 
 [Service]
+User=multiflexi
+Group=multiflexi
 EnvironmentFile=/etc/multiflexi/multiflexi.env
 ExecStart=/usr/bin/php /usr/lib/multiflexi/daemon.php
 LimitNOFILE=8192:16384