diff --git a/gencode-remote b/gencode-remote index 856298e..4320996 100755 --- a/gencode-remote +++ b/gencode-remote @@ -67,24 +67,3 @@ if [ ! "$INSTALL_STATE" ] ; then sudo -u www-data php occ config:system:set trusted_domains 2 --value="$domain" fi eof - -destination=/etc/nginx/ - -# Create 48 bit random key for nginx -if [ -f "$__object/parameter/ssl-cert" ] || [ -f "$__object/parameter/ssl-key" ] || [ -f "$__object/parameter/ssl"]; then -cat < ${destination}nginx-ticketkey" - fi -eof -fi - -# Create the Diffie-Hellman key - -dh=$(cat "$__object/parameter/dh") - -cat <&2 - exit 1 - ;; -esac - -if [ -f "$__object/parameter/custom-config-from-stdin" ]; then - custom_config="$__object/stdin" -else - custom_config="" -fi # Install packages for package in php7.0-common php7.0-gd php7.0-json php7.0-pgsql php7.0-curl \ @@ -93,209 +62,6 @@ require="__apt_source/dotdeb" __apt_update_index require="__package/php7.0-fpm" __file /etc/php/7.0/fpm/pool.d/www.conf \ --owner root --group root --mode 644 --source "$__type/files/fpm.conf" - - -# Configure nginx -#require="__package/nginx" __file /etc/nginx/sites-enabled/nextcloud --owner www-data \ -# --group www-data --mode 755 --source "$__type/files/nextcloud.nginx" - -base_config="$__type/files/base_config/${os}.conf" -require="__package/nginx" __file /etc/nginx/nginx.conf --source "$base_config" --mode 0644 - -################################################################################ -# create base / switch to type dir -# -mkdir "$__object/files" -cd "$__type/files" - -################################################################################ -# SSL / HTTPs configuration -# -if [ -f "$__object/parameter/ssl" ]; then - if [ ! -f "$__object/parameter/ssl-cert" ] || [ ! -f "$__object/parameter/ssl-key" ] || [ ! -f "$__object/parameter/dh" ]; then - echo "Missing parameter" >&2 - else - ssl_cert="$(cat "$__object/parameter/ssl-cert")" - ssl_key="$(cat "$__object/parameter/ssl-key")" - - # create symlink for SSL certificates - require="__package/nginx" __link /etc/nginx/ssl.crt \ - --source "$ssl_cert" --type symbolic - - require="__package/nginx" __link /etc/nginx/ssl.key \ - --source "$ssl_key" --type symbolic - - # create the https nginx config - require="__package/nginx" __file "$nginx_https" --owner root \ - --group root \ - --mode 0644 --source - < "$ssl_redirect_file" - # ssl_redirect_file_content=$(cat $ssl_redirect_file) - #fi -#else -# ssl_redirect_file="" -fi - - ## Postgres require="__package/postgresql" __postgres_role "${db_user}" --password "${db_pass}"\ --login --createdb @@ -303,7 +69,6 @@ require="__package/postgresql" __postgres_role "${db_user}" --password "${db_pas require="__package/postgresql __postgres_role/${db_user}" __postgres_database "${db_name}"\ --owner "${db_user}" --state present - # Start on boot require="__package/postgresql" __start_on_boot postgresql require="__package/nginx" __start_on_boot nginx diff --git a/parameter/required b/parameter/required index f9aee89..e69de29 100644 --- a/parameter/required +++ b/parameter/required @@ -1,2 +0,0 @@ -dh -domain