gabriel
/
nextcloud_ynh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

new permission hpb, some fixes

add-notify_push-option
Kay0u 5 years ago
parent
335afb6902
commit
36f75ce177
No known key found for this signature in database GPG Key ID: AAFEEB16CFA2AE2D
8 changed files with 44 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      check_process
  2. 3
      conf/config.json
  3. 1
      conf/systemd.service
  4. 4
      scripts/change_url
  5. 19
      scripts/install
  6. 2
      scripts/remove
  7. 6
      scripts/restore
  8. 19
      scripts/upgrade

1
check_process
View File

@ -4,6 +4,7 @@
path="/path"
admin="homer"
user_home="1"
use_notify_push="1"
; Checks
pkg_linter=1
setup_sub_dir=1

3
conf/config.json
View File

@ -12,7 +12,8 @@
"password": ""
},
"hashing_default_password": true,
"localstorage.allowsymlinks": true
"localstorage.allowsymlinks": true,
"trusted_proxies": [ "127.0.0.1", "::1" ]
},
"apps": {
"user_ldap": {

1
conf/systemd.service
View File

@ -4,6 +4,7 @@ Description = Push daemon for Nextcloud clients
[Service]
Environment=SOCKET_PATH=/var/run/__APP__/notify-push.sock
Environment=NEXTCLOUD_URL=https://__DOMAIN____PATH__
Environment=ALLOW_SELF_SIGNED=true
ExecStart=__FINAL_PATH__/apps/notify_push/bin/x86_64/notify_push __FINAL_PATH__/config/config.php
User=__APP__
Group=__APP__

4
scripts/change_url
View File

@ -142,6 +142,10 @@ fi
if [ $use_notify_push -eq 1 ]
then
domain="$new_domain"
path_url="$new_path"
exec_occ config:app:set notify_push base_endpoint --value https://$domain$path_url/push
ynh_add_systemd_config --service="${app}-notify-push"
ynh_systemd_action --service_name="${app}-notify-push" --action=restart

19
scripts/install
View File

@ -313,13 +313,12 @@ ynh_multimedia_addaccess $app
if [ $use_notify_push -eq 1 ]
then
exec_occ app:install notify_push
exec_occ config:app:set notify_push base_endpoint --value https://$domain$path_url/push
mkdir -p /var/run/$app/
chown $app: /var/run/$app/
ynh_add_systemd_config --service="${app}-notify-push"
ynh_systemd_action --service_name="${app}-notify-push" --action=restart
fi
#=================================================
@ -336,6 +335,10 @@ find $datadir/ -type f -print0 | xargs -0 chmod 0640
find $datadir/ -type d -print0 | xargs -0 chmod 0750
chmod 640 "$final_path/config/config.php"
chmod 755 /home/yunohost.app
if [ $use_notify_push -eq 1 ]
then
chmod 740 $final_path/apps/notify_push/bin/x86_64/notify_push
fi
#=================================================
# SETUP LOGROTATE
@ -358,7 +361,11 @@ ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" -
#=================================================
ynh_script_progression --message="Configuring SSOwat..."
ynh_permission_create --permission="api" --label="api" --url="re:$(sed 's/[\.\-]/\%&/g' <<< $domain)/%.well%-known/.*" --allowed="visitors" "all_users" --auth_header="false" --show_tile="false" --protected="true"
if [ $use_notify_push -eq 1 ]
then
ynh_permission_create --permission="hpb" --label="High Performance Backend" --url="/push" --additional_urls="/index.php/apps/notify_push/" --allowed="visitors" --auth_header="false" --show_tile="false" --protected="true"
fi
#=================================================
# RELOAD NGINX
@ -373,8 +380,10 @@ ynh_systemd_action --service_name=nginx --action=reload
if [ $use_notify_push -eq 1 ]
then
if ! ynh_exec_as "$app" php${phpversion} $final_path/occ notify_push:self-test; then
ynh_print_warn --message="High Performance Backend is not working correctly, try to repair it or contact YNH support."
ynh_systemd_action --service_name="${app}-notify-push" --action=restart
if ! exec_occ notify_push:self-test; then
ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
fi
fi

2
scripts/remove
View File

@ -85,7 +85,7 @@ ynh_remove_fail2ban_config
ynh_script_progression --message="Stopping and removing the systemd service..."
ynh_remove_systemd_config --service="${app}-notify-push"
ynh_secure_remove --file="/var/run/$app/"
ynh_secure_remove --file="/var/run/$app"
#=================================================
# SPECIFIC REMOVE

6
scripts/restore
View File

@ -202,8 +202,10 @@ ynh_systemd_action --service_name=nginx --action=reload
if [ $use_notify_push -eq 1 ]
then
if ! ynh_exec_as "$app" php${phpversion} $final_path/occ notify_push:self-test; then
ynh_print_warn --message="High Performance Backend is not working correctly, try to repair it or contact YNH support."
ynh_systemd_action --service_name="${app}-notify-push" --action=restart
if ! exec_occ notify_push:self-test; then
ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
fi
fi

19
scripts/upgrade
View File

@ -115,6 +115,15 @@ if ynh_legacy_permissions_exists; then
ynh_permission_create --permission="api" --label="api" --url="re:$(sed 's/[\.\-]/\%&/g' <<< $domain)/%.well%-known/.*" --allowed="visitors" "all_users" --auth_header="false" --show_tile="false" --protected="true"
fi
if [ $use_notify_push -eq 1 ] && ! ynh_permission_exists --permission="hpb"
then
ynh_permission_create --permission="hpb" --label="High Performance Backend" --url="/push" --additional_urls="/index.php/apps/notify_push/" --allowed="visitors" --auth_header="false" --show_tile="false" --protected="true"
elif [ $use_notify_push -eq 0 ] && ynh_permission_exists --permission="hpb"
then
ynh_permission_delete --permission="hpb"
fi
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
@ -460,6 +469,10 @@ find $datadir/ -type f -print0 | xargs -0 chmod 0640
find $datadir/ -type d -print0 | xargs -0 chmod 0750
chmod 640 "$final_path/config/config.php"
chmod 755 /home/yunohost.app
if [ $use_notify_push -eq 1 ]
then
chmod 740 $final_path/apps/notify_push/bin/x86_64/notify_push
fi
#=================================================
# WARNING ABOUT THIRD-PARTY APPS
@ -504,8 +517,10 @@ ynh_systemd_action --service_name="php${phpversion}-fpm" --action=reload
if [ $use_notify_push -eq 1 ]
then
if ! ynh_exec_as "$app" php${phpversion} $final_path/occ notify_push:self-test; then
ynh_print_warn --message="High Performance Backend is not working correctly, try to repair it or contact YNH support."
ynh_systemd_action --service_name="${app}-notify-push" --action=restart
if ! exec_occ notify_push:self-test; then
ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
fi
fi

Write Preview
Loading…
Cancel
Save