diff --git a/manifest b/manifest index c3504ad..b19e932 100755 --- a/manifest +++ b/manifest @@ -26,17 +26,11 @@ then fi os_version=$(cat "$__global/explorer/os_version") case "$os_version" in - 8*) + 8*|jessie) distribution="jessie" - : ;; - 9*) + 9*|ascii) distribution="stretch" - : - ;; - jessie*) - distribution="jessie" - : ;; *) echo "Unsupported version $os_version of $os." >&2 @@ -50,8 +44,6 @@ db_name=$(cat "$__object/parameter/db-name") domain=$(cat "$__object/parameter/domain") - - __apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \ --distribution ${distribution} \ @@ -70,8 +62,8 @@ done __package postgresql --state=present __package curl --state=present -# Configure packages -## PHP 7 +# Configure packages +## PHP 7 require="__package/php7.0-fpm" __file /etc/php/7.0/fpm/pool.d/www.conf \ @@ -85,13 +77,13 @@ require="__package/nginx" __file /etc/nginx/sites-enabled/nextcloud --owner www- ## Postgres require="__package/postgresql" __postgres_role "${db_user}" --password "${db_pass}"\ - --login --createdb - + --login --createdb + require="__package/postgresql __postgres_role/${db_user}" __postgres_database "${db_name}"\ --owner "${db_user}" --state present -# Start on boot +# Start on boot require="__package/postgresql" __start_on_boot postgresql require="__package/nginx" __start_on_boot nginx require="__package/php7.0-fpm" __start_on_boot php7.0-fpm