YunoHost-Apps/snserver_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/snserver_ynh.git synced 2024-09-03 20:26:22 +02:00
Code Issues Activity Actions

Fix install issues, improvments

Browse source
This commit is contained in:
Fabian Wilkens 2021-07-06 15:51:24 +02:00
parent 880d695f4c
commit 1e1a36ce9a
No known key found for this signature in database
GPG key ID: 23DFA025BB4E9FAB
4 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/env_auth-worker.env.sample
View file

@ -6,7 +6,7 @@ NODE_ENV="production"
JWT_SECRET=__JWT_SECRET__ JWT_SECRET=__JWT_SECRET__
LEGACY_JWT_SECRET=__LEGACY_JWT_SECRET__ LEGACY_JWT_SECRET=__LEGACY_JWT_SECRET__
AUTH_JWT_SECRET=__AUTH_JWT_SECRET__ AUTH_JWT_SECRET=__AUTH_JWT_SECRET__
AUTH_JWT_TTL=60 AUTH_JWT_TTL=60000
# Must be a hex string exactly 32 bytes long # Must be a hex string exactly 32 bytes long
# e.g. feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 # e.g. feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308

2
conf/env_auth.env.sample
View file

@ -6,7 +6,7 @@ NODE_ENV="production"
JWT_SECRET=__JWT_SECRET__ JWT_SECRET=__JWT_SECRET__
LEGACY_JWT_SECRET=__LEGACY_JWT_SECRET__ LEGACY_JWT_SECRET=__LEGACY_JWT_SECRET__
AUTH_JWT_SECRET=__AUTH_JWT_SECRET__ AUTH_JWT_SECRET=__AUTH_JWT_SECRET__
AUTH_JWT_TTL=60 AUTH_JWT_TTL=60000
# Must be a hex string exactly 32 bytes long # Must be a hex string exactly 32 bytes long
# e.g. feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 # e.g. feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308

10
conf/nginx.conf
View file

@ -1,6 +1,4 @@
location __PATH__/ { location __PATH__/ {
alias __FINALPATH__/live/public ;
if ($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }
@ -12,8 +10,14 @@ location __PATH__/ {
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_buffering off; proxy_buffering off;
}
more_set_headers "Content-Security-Policy: frame-ancestors 'self' __ACCESS_DOMAIN__"; location = __PATH__/ {
default_type text/plain;
return 200 "
This is where Standard Notes - Sycning Server is installed.
Add https://__DOMAIN__PATH__/ as Sync Server Domain in the Advanced Options to use this Syncing Server.";
} }
location = __PATH__/extensions { location = __PATH__/extensions {

47
scripts/install
View file

@ -78,12 +78,11 @@ port_syncing_server_js_worker=$(ynh_find_port --port=$((port_syncing_server_js+1
port_auth=$(ynh_find_port --port=$((port_syncing_server_js_worker+1))) port_auth=$(ynh_find_port --port=$((port_syncing_server_js_worker+1)))
port_auth_worker=$(ynh_find_port --port=$((port_auth+1))) port_auth_worker=$(ynh_find_port --port=$((port_auth+1)))
port_api_gateway=$(ynh_find_port --port=$((port_auth_worker+1))) port_api_gateway=$(ynh_find_port --port=$((port_auth_worker+1)))
# Open the port ynh_app_setting_set --app=$app --key=port_syncing_server_js --value=$port_syncing_server_js
ynh_app_setting_set --app=$app --key=port --value=$port_syncing_server_js ynh_app_setting_set --app=$app --key=port_syncing_server_js_worker --value=$port_syncing_server_js_worker
ynh_app_setting_set --app=$app --key=port --value=$port_syncing_server_js_worker ynh_app_setting_set --app=$app --key=port_auth --value=$port_auth
ynh_app_setting_set --app=$app --key=port --value=$port_auth ynh_app_setting_set --app=$app --key=port_auth_worker --value=$port_auth_worker
ynh_app_setting_set --app=$app --key=port --value=$port_auth_worker ynh_app_setting_set --app=$app --key=port_api_gateway --value=$port_api_gateway
ynh_app_setting_set --app=$app --key=port --value=$port_api_gateway
#================================================= #=================================================
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
@ -207,24 +206,29 @@ ynh_use_nodejs
#ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' #ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development'
#ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) #ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
pushd "$final_path/live/syncing-server-js" pushd "$final_path/live/syncing-server-js"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile ynh_print_info "Installing ... [1/5]"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
popd popd
pushd "$final_path/live/syncing-server-js-worker" pushd "$final_path/live/syncing-server-js-worker"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile ynh_print_info "Installing ... [2/5]"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
popd popd
pushd "$final_path/live/auth" pushd "$final_path/live/auth"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile ynh_print_info "Installing ... [3/5]"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
popd popd
pushd "$final_path/live/auth-worker" pushd "$final_path/live/auth-worker"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile ynh_print_info "Installing ... [4/5]"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
popd popd
pushd "$final_path/live/api-gateway" pushd "$final_path/live/api-gateway"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile ynh_print_info "Installing ... [5/5]"
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
popd popd
#================================================= #=================================================
# INSTALLING Standard Notes - Extensions # INSTALLING Standard Notes - Extensions
@ -320,7 +324,7 @@ if [ $is_public -eq 1 ]
then then
# Everyone can access the app. # Everyone can access the app.
# The "main" permission is automatically created before the install script. # The "main" permission is automatically created before the install script.
ynh_permission_update --permission="main" --add="visitors" --remove="all_users" ynh_permission_update --permission="main" --add="visitors"
fi fi
#================================================= #=================================================
@ -333,7 +337,7 @@ ynh_systemd_action \
--service_name="$app-syncing-server-js" \ --service_name="$app-syncing-server-js" \
--action="start" \ --action="start" \
--log_path="/var/log/$app/syncing-server-js.log" \ --log_path="/var/log/$app/syncing-server-js.log" \
--line_match='{"message":"Server started on port 3000","level":"info"}' --line_match='{"message":"Server started on port '$port_syncing_server_js'","level":"info"}'
ynh_systemd_action \ ynh_systemd_action \
--service_name="$app-syncing-server-js-worker" \ --service_name="$app-syncing-server-js-worker" \
--action="start" \ --action="start" \
@ -343,7 +347,7 @@ ynh_systemd_action \
--service_name="$app-auth" \ --service_name="$app-auth" \
--action="start" \ --action="start" \
--log_path="/var/log/$app/auth.log" \ --log_path="/var/log/$app/auth.log" \
--line_match='{"message":"Server started on port 3002","level":"info"}' --line_match='{"message":"Server started on port '$port_auth'","level":"info"}'
ynh_systemd_action \ ynh_systemd_action \
--service_name="$app-auth-worker" \ --service_name="$app-auth-worker" \
--action="start" \ --action="start" \
@ -351,8 +355,9 @@ ynh_systemd_action \
--line_match='{"message":"Starting worker...","level":"info"}' --line_match='{"message":"Starting worker...","level":"info"}'
ynh_systemd_action \ ynh_systemd_action \
--service_name="$app-api-gateway" \ --service_name="$app-api-gateway" \
--action="start" --log_path="/var/log/$app/api-gateway.log" \ --action="start" \
--line_match='{"message":"Server started on port 3006","level":"info"}' --log_path="/var/log/$app/api-gateway.log" \
--line_match='{"message":"Server started on port '$port_api_gateway'","level":"info"}'
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX