diff --git a/conf/.env b/conf/.env index 8ea98a5..313b1a9 100644 --- a/conf/.env +++ b/conf/.env @@ -1,4 +1,5 @@ MINIO_ROOT_USER=__APP__ MINIO_ROOT_PASSWORD=__MINIO_KEY__ MINIO_VOLUMES="__DATADIR__/" +MINIO_BROWSER_REDIRECT_URL=https://__DOMAIN__ MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" diff --git a/conf/nginx.conf b/conf/nginx.conf index 44fd264..1e22b95 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location / { +location /server/ { # Force usage of https if ($scheme = http) { @@ -19,3 +19,25 @@ location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } + +location / { + + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + proxy_pass http://127.0.0.1:__CONSOLE_PORT__/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_cache_bypass $http_upgrade; + proxy_ignore_client_abort on; + client_max_body_size 200M; + + # forward headers + proxy_buffering off; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; +} diff --git a/scripts/install b/scripts/install index 2271559..62fd48b 100755 --- a/scripts/install +++ b/scripts/install @@ -194,7 +194,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" --api S3v4 + ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain/server" "$app" "$minio_key" --api S3v4 popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e5a8ddd..aba24b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -153,7 +153,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" --api S3v4 + ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain/server" "$app" "$minio_key" --api S3v4 popd #=================================================