Skip to content

Commit ef224f2

Browse files
author
Marius Burkard
committed
Merge branch '6039-jk_init_plus' into 'develop'
Resolve "Jailkit init template have syntax errors" Closes #6039 See merge request ispconfig/ispconfig3!1400
2 parents bf829a5 + f0203e4 commit ef224f2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

install/tpl/jk_init.ini.master

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ paths_w_setuid = /bin/ping
149149
#paths = /usr/bin/X11/xterm, /usr/share/terminfo, /etc/terminfo
150150
#devices = /dev/pts/0, /dev/pts/1, /dev/pts/2, /dev/pts/3, /dev/pts/4, /dev/ptyb4, /dev/ptya4, /dev/tty, /dev/tty0, /dev/tty4
151151

152-
+# coreutils from:
153-
+# (echo -ne '\n[coreutils]\ncomment = non-sbin progs from coreutils\npaths = '; dpkg --listfiles coreutils | grep -E '^/bin/|/usr/bin/' | xargs -n1 -i@ echo -n "@, " | sed -e 's/, *$/\n/g' -e 's|/usr/bin/||g' -e 's|/bin/||g') >> /etc/jailkit/jk_init.ini
152+
# coreutils from:
153+
# (echo -ne '\n[coreutils]\ncomment = non-sbin progs from coreutils\npaths = '; dpkg --listfiles coreutils | grep -E '^/bin/|/usr/bin/' | xargs -n1 -i@ echo -n "@, " | sed -e 's/, *$/\n/g' -e 's|/usr/bin/||g' -e 's|/bin/||g') >> /etc/jailkit/jk_init.ini
154154

155155
[coreutils]
156156
comment = non-sbin progs from coreutils
@@ -225,3 +225,8 @@ includesections = php_common
225225
comment = php version 7.4
226226
paths = /usr/bin/php7.4, /usr/lib/php/7.4/, /usr/lib/php/20190902/, /usr/share/php/7.4/, /etc/php/7.4/cli/, /etc/php/7.4/mods-available/
227227
includesections = php_common
228+
229+
[php8_0]
230+
comment = php version 8.0
231+
paths = /usr/bin/php8.0, /usr/lib/php/8.0/, /usr/lib/php/20200930/, /usr/share/php/8.0/, /etc/php/8.0/cli/, /etc/php/8.0/mods-available/
232+
includesections = php_common

0 commit comments

Comments
 (0)