ungleich-public/__ungleich_nextcloud
6
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

bugfixes for the php/fpm configuration

Browse source
This commit is contained in:
Dominique Roux 2019-11-19 18:04:26 +01:00
parent 4a07815600
commit 031e73124a
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/fpm.conf
View file

@ -3,7 +3,7 @@
user = www-data user = www-data
group = www-data group = www-data
listen = /run/php/php7.0-fpm.sock listen = /run/php/phpVERSION-fpm.sock
listen.owner = www-data listen.owner = www-data
listen.group = www-data listen.group = www-data

9
manifest
View file

@ -73,13 +73,14 @@ for package in ${packages}
do require="__apt_update_index" __package $package --state=present do require="__apt_update_index" __package $package --state=present
done done
__package postgresql --state=present require="__apt_update_index" __package postgresql --state=present
__package curl --state=present require="__apt_update_index" __package curl --state=present
# Configure packages # Configure packages
## PHP 7 ## PHP 7
sed "s/VERSION/$phpv/" "$__type/files/fpm.conf" > "$tmpdir/fpm"
require="__package/php${phpv}-fpm" __file /etc/php/${phpv}/fpm/pool.d/www.conf \ require="__package/php${phpv}-fpm" __file /etc/php/${phpv}/fpm/pool.d/www.conf \
--owner root --group root --mode 644 --source "$__type/files/fpm.conf" --owner root --group root --mode 644 --source "$tmpdir/fpm"
@ -97,7 +98,7 @@ require="__ungleich_http_server_ssl_redirect_letsencrypt/$domain" \
### The SSL configuration ### The SSL configuration
sed "s/DOMAIN/$domain/" "$__type/files/nextcloud.nginx" > "$tmpdir/nginx" sed "s/DOMAIN/$domain/" "$__type/files/nextcloud.nginx" > "$tmpdir/nginx"
sed "s/VERSION/$phpv/" "$__type/files/nextcloud.nginx" > "$tmpdir/nginx" sed -i "s/VERSION/$phpv/" "$tmpdir/nginx"
require="__letsencrypt_cert/$domain __package/nginx" __file /etc/nginx/sites-enabled/nextcloud \ require="__letsencrypt_cert/$domain __package/nginx" __file /etc/nginx/sites-enabled/nextcloud \
--owner www-data \ --owner www-data \
--group www-data \ --group www-data \