diff --git a/conf/nginx.conf b/conf/nginx.conf index 8ae2f3e..0217f01 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,11 +7,11 @@ location __PATH__/ { proxy_buffering off; more_set_headers "X-Frame-Options : ALLOWALL"; - proxy_set_header X-Real-IP $remote_addr; # http://wiki.nginx.org/HttpProxyModule - proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP - proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used - proxy_set_header Host $host; # pass the host header - proxy_http_version 1.1; # recommended with keepalive connections + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + proxy_http_version 1.1; # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html proxy_set_header Upgrade $http_upgrade; diff --git a/conf/systemd.service b/conf/systemd.service index 39c863b..748a48d 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,10 +7,9 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -Environment="ETHERPAD_PRODUCTION=true" Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__INSTALL_DIR__/bin/run.sh +ExecStart=__NODEJS_PATH__/pnpm run prod Restart=always # Sandboxing options to harden security diff --git a/scripts/_common.sh b/scripts/_common.sh index 184eecc..44277c5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=22 +nodejs_version=20 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 344dcc8..364cc9a 100644 --- a/scripts/install +++ b/scripts/install @@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate - ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh + ynh_exec_warn_less env $ynh_node_load_PATH pnpm --recursive i --production popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ac5a20f..e6bbe3f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,7 +102,8 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate - ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh + ynh_exec_warn_less env $ynh_node_load_PATH pnpm --recursive i --production + ynh_secure_remove --file="$install_dir/var/minified*" popd #=================================================