Skip to content

Commit 89a49bd

Browse files
Max WellMax Well
authored andcommitted
Improve jk_init.ini
* Add arm64 support to uidbasics and netbasics * Add armhf and arm64 support to MySQL * Include all supported PHP versions in jail * Add /etc/localtime to PHP jail to fix a critical PHP error * Introduce ImageMagick support
1 parent 46050ef commit 89a49bd

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

install/tpl/jk_init.ini.master

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
[uidbasics]
88
comment = common files for all jails that need user/group information
9-
paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, /lib/x86_64-linux-gnu/libnss*.so.2, /lib/arm-linux-gnueabihf/libnss*.so.2, /lib/arm-linux-gnueabihf/libnsl*.so.1, /etc/nsswitch.conf, /etc/ld.so.conf
9+
paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, /lib/x86_64-linux-gnu/libnss*.so.2, /lib/arm-linux-gnueabihf/libnsl*.so.1, /lib/arm-linux-gnueabihf/libnss*.so.2, /lib/aarch64-linux-gnu/libnsl.so.1, /lib/aarch64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
1010

1111
[netbasics]
1212
comment = common files for all jails that need any internet connectivity
13-
paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /lib/libnss_mdns*.so.2, /lib/i386-linux-gnu/libnss_dns.so.2, /lib/x86_64-linux-gnu/libnss_dns.so.2, /etc/resolv.conf, /etc/host.conf, /etc/hosts, /etc/protocols, /etc/services, /etc/ssl/certs/, /usr/lib/ssl/certs
13+
paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /lib/libnss_mdns*.so.2, /lib/i386-linux-gnu/libnss_dns.so.2, /lib/x86_64-linux-gnu/libnss_dns.so.2, /lib/arm-linux-gnueabihf/libnss_dns.so.2, /lib/aarch64-linux-gnu/libnss_dns.so.2, /etc/resolv.conf, /etc/host.conf, /etc/hosts, /etc/protocols, /etc/services, /etc/ssl/certs/, /usr/lib/ssl/certs
1414

1515
[logbasics]
1616
comment = timezone information and log sockets
@@ -163,7 +163,7 @@ includesections = php, mysql-client
163163

164164
[mysql-client]
165165
comment = mysql client
166-
paths = mysql, mysqldump, mysqlshow, /usr/lib/libmysqlclient.so, /usr/lib/i386-linux-gnu/libmariadb.so.3, /usr/lib/i386-linux-gnu/mariadb19, /usr/lib/x86_64-linux-gnu/libmariadb.so.3, /usr/lib/x86_64-linux-gnu/mariadb19
166+
paths = mysql, mysqldump, mysqlshow, /usr/lib/libmysqlclient.so, /usr/lib/i386-linux-gnu/libmariadb.so.3, /usr/lib/i386-linux-gnu/mariadb19, /usr/lib/x86_64-linux-gnu/libmariadb.so.3, /usr/lib/x86_64-linux-gnu/mariadb19, /usr/lib/arm-linux-gnueabihf/libmariadb.so.3, /usr/lib/arm-linux-gnueabihf/mariadb19, /usr/lib/aarch64-linux-gnu/libmariadb.so.3, /usr/lib/aarch64-linux-gnu/mariadb19
167167
includesections = netbasics
168168

169169
[composer]
@@ -185,15 +185,15 @@ paths = env
185185
[php]
186186
comment = default php version and libraries
187187
paths = /usr/bin/php
188-
includesections = php_common, php7_3
188+
includesections = php_common, php5_6, php7_0, php7_1, php7_2, php7_3, php7_4
189189

190190
[php_common]
191191
comment = common php directories and libraries
192192
# notice: potential information leak
193193
# do not add all of /etc/php/ or any of the fpm directories
194194
# or the php config (which includes custom php snippets) from *all*
195195
# sites which use fpm will be copied to *every* jailkit
196-
paths = /usr/bin/php, /usr/lib/php/, /usr/share/php/, /usr/share/zoneinfo/
196+
paths = /usr/bin/php, /usr/lib/php/, /usr/share/php/, /usr/share/zoneinfo/, /etc/localtime
197197
includesections = env
198198

199199
[php5_6]
@@ -225,3 +225,7 @@ 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+
[imagemagick]
230+
comment = ImageMagick needed for php-imagemagick extension
231+
paths = /usr/share/ImageMagick-*, /etc/ImageMagick-*, /usr/lib/i386-linux-gnu/ImageMagick-*, /usr/lib/x86_64-linux-gnu/ImageMagick-*, /usr/lib/arm-linux-gnueabihf/ImageMagick-*, /usr/lib/aarch64-linux-gnu/ImageMagick-*

0 commit comments

Comments
 (0)