RecycledCloud/cdist-recycledcloud
Archived
6
0
Fork 0
Code Releases Activity

Make the RC_WP type accept altdomains to pass on to nginx.

Browse source
This commit is contained in:
Joachim Desroches 2021-07-06 16:49:36 +02:00
parent cb32efde61
commit 46397cca9c
No known key found for this signature in database
GPG key ID: 6778C9C29C02D691
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
type/__recycledcloud_wordpress/manifest
View file

@ -12,6 +12,12 @@ fi
mysql_password="$(cat "${__object:?}/parameter/mysql-password")" mysql_password="$(cat "${__object:?}/parameter/mysql-password")"
nginx_domain="$(cat "${__object:?}/parameter/nginx-domain")" nginx_domain="$(cat "${__object:?}/parameter/nginx-domain")"
altdomains=
while read -r altdomain;
do
altdomains="--altdomain $altdomain $altdomains"
done < "${__object:?}/parameter/altdomains"
max_upload_size=100M max_upload_size=100M
php_fpm_socket=/run/php-fpm7/php-fpm.sock php_fpm_socket=/run/php-fpm7/php-fpm.sock
@ -43,7 +49,10 @@ require="__recycledcloud_mysql" __mysql_database wordpress \
# NGINX vhost for wordpress hosting. # NGINX vhost for wordpress hosting.
__package nginx __package nginx
# shellcheck disable=SC2086
require="__package/nginx" __recycledcloud_nginx "$nginx_domain" \ require="__package/nginx" __recycledcloud_nginx "$nginx_domain" \
$altdomains \
--config - <<- EOF --config - <<- EOF
root /var/www/wordpress; root /var/www/wordpress;
index index.php; index index.php;

1
type/__recycledcloud_wordpress/parameter/optional Normal file
View file

@ -0,0 +1 @@
altdomains