From 46397cca9cf33fd83299dd49437e95700a32bb94 Mon Sep 17 00:00:00 2001 From: Joachim Desroches Date: Tue, 6 Jul 2021 16:49:36 +0200 Subject: [PATCH] Make the RC_WP type accept altdomains to pass on to nginx. --- type/__recycledcloud_wordpress/manifest | 9 +++++++++ type/__recycledcloud_wordpress/parameter/optional | 1 + 2 files changed, 10 insertions(+) create mode 100644 type/__recycledcloud_wordpress/parameter/optional diff --git a/type/__recycledcloud_wordpress/manifest b/type/__recycledcloud_wordpress/manifest index c7c49d2..94edeca 100644 --- a/type/__recycledcloud_wordpress/manifest +++ b/type/__recycledcloud_wordpress/manifest @@ -12,6 +12,12 @@ fi mysql_password="$(cat "${__object:?}/parameter/mysql-password")" 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 php_fpm_socket=/run/php-fpm7/php-fpm.sock @@ -43,7 +49,10 @@ require="__recycledcloud_mysql" __mysql_database wordpress \ # NGINX vhost for wordpress hosting. __package nginx + +# shellcheck disable=SC2086 require="__package/nginx" __recycledcloud_nginx "$nginx_domain" \ + $altdomains \ --config - <<- EOF root /var/www/wordpress; index index.php; diff --git a/type/__recycledcloud_wordpress/parameter/optional b/type/__recycledcloud_wordpress/parameter/optional new file mode 100644 index 0000000..d3ebd88 --- /dev/null +++ b/type/__recycledcloud_wordpress/parameter/optional @@ -0,0 +1 @@ +altdomains