Skip to content

Commit 3e536aa

Browse files
author
Marius Burkard
committed
Merge branch '6274-add-curl-to-jailkit-applications' into 'develop'
Add curl and php 8.2 to jailkit applications Closes #6275 and #6274 See merge request ispconfig/ispconfig3!1564
2 parents 569eec5 + da73d6a commit 3e536aa

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

install/dist/tpl/gentoo/jk_init.ini.master

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ regularfiles = /etc/vimrc
9696
directories = /etc/joe, /etc/terminfo, /usr/share/vim, /usr/share/terminfo, /usr/lib/terminfo
9797

9898
[netutils]
99-
comment = several internet utilities like wget, ftp, rsync, scp, ssh
100-
executables = /usr/bin/wget, /usr/bin/lynx, /usr/bin/ftp, /usr/bin/host, /usr/bin/rsync, /usr/bin/smbclient
99+
comment = several internet utilities like curl, wget, ftp, rsync, scp, ssh
100+
executables = /usr/bin/curl /usr/bin/wget, /usr/bin/lynx, /usr/bin/ftp, /usr/bin/host, /usr/bin/rsync, /usr/bin/smbclient
101101
includesections = netbasics, ssh, sftp, scp
102102
directories = /etc/ssl/certs/
103103
regularfiles = /usr/lib/ssl/certs

install/tpl/jk_init.ini.master

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ paths = awk, bzip2, bunzip2, ldd, less, clear, cut, du, find, head, less, md5sum
8787
includesections = basicshell, midnightcommander, editors
8888

8989
[terminfo]
90-
comment = terminfo databases, required for example for ncurses or vim
90+
comment = terminfo databases, required for example for ncurses or vim
9191
paths = /etc/terminfo, /usr/share/terminfo, /lib/terminfo
9292

9393
[editors]
@@ -96,8 +96,8 @@ includesections = terminfo
9696
paths = joe, nano, vi, vim, /etc/vimrc, /etc/joe, /usr/share/vim
9797

9898
[netutils]
99-
comment = several internet utilities like wget, ftp, rsync, scp, ssh
100-
paths = wget, lynx, ftp, host, rsync, smbclient
99+
comment = several internet utilities like curl, wget, ftp, rsync, scp, ssh
100+
paths = curl, wget, lynx, ftp, host, rsync, smbclient
101101
includesections = netbasics, ssh, sftp, scp
102102

103103
[apacheutils]
@@ -238,6 +238,11 @@ comment = php version 8.1
238238
paths = /usr/bin/php8.1, /usr/lib/php/8.1/, /usr/lib/php/20210902/, /usr/share/php/8.1/, /etc/php/8.1/cli/, /etc/php/8.1/mods-available/
239239
includesections = php_common
240240

241+
[php8_2]
242+
comment = php version 8.2
243+
paths = /usr/bin/php8.2, /usr/lib/php/8.2/, /usr/lib/php/20210902/, /usr/share/php/8.2/, /etc/php/8.2/cli/, /etc/php/8.2/mods-available/
244+
includesections = php_common
245+
241246
[imagemagick]
242247
comment = ImageMagick needed for php-imagemagick extension
243248
paths = /usr/share/ImageMagick-*, /etc/ImageMagick-*, /usr/lib/*/ImageMagick-*

0 commit comments

Comments
 (0)