Fix check starting service

This commit is contained in:
Josué Tille 2019-08-01 15:32:59 +02:00
parent 9babd36be2
commit c734163ed7
No known key found for this signature in database
GPG Key ID: 716A6C99B04194EF
4 changed files with 8 additions and 5 deletions

View File

@ -26,6 +26,7 @@ dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
admin=$(ynh_app_setting_get "$app" adminusername) admin=$(ynh_app_setting_get "$app" adminusername)
key=$(ynh_app_setting_get "$app" secret_key) key=$(ynh_app_setting_get "$app" secret_key)
port=$(ynh_app_setting_get "$app" web_port) port=$(ynh_app_setting_get "$app" web_port)
upstream_version=$(ynh_app_setting_get $app upstream_version)
#================================================= #=================================================
# STANDARD MODIFICATIONS # STANDARD MODIFICATIONS
@ -50,7 +51,7 @@ config_nginx
config_gitea config_gitea
# RELOAD services # RELOAD services
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" -a restart ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -a restart -t 5
sleep 1 sleep 1
# Store the checksum with the 'INTERNAL_TOKEN' value. # Store the checksum with the 'INTERNAL_TOKEN' value.

View File

@ -19,6 +19,7 @@ domain=$YNH_APP_ARG_DOMAIN
path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH) path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH)
admin=$YNH_APP_ARG_ADMIN admin=$YNH_APP_ARG_ADMIN
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
upstream_version=$(ynh_app_upstream_version)
# Check domain/path availability # Check domain/path availability
ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain." ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
@ -113,10 +114,10 @@ yunohost service add "$app" --log "/var/log/$app/$app.log"
ynh_use_logrotate "/var/log/$app" ynh_use_logrotate "/var/log/$app"
# Save Version # Save Version
ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version) ynh_app_setting_set $app upstream_version $upstream_version
# Reload services # Reload services
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
sleep 1 sleep 1
# Store the checksum with the 'INTERNAL_TOKEN' value. # Store the checksum with the 'INTERNAL_TOKEN' value.

View File

@ -20,6 +20,7 @@ path_url=$(ynh_app_setting_get "$app" path)
dbpass=$(ynh_app_setting_get "$app" mysqlpwd) dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
admin=$(ynh_app_setting_get "$app" adminusername) admin=$(ynh_app_setting_get "$app" adminusername)
port=$(ynh_app_setting_get "$app" web_port) port=$(ynh_app_setting_get "$app" web_port)
upstream_version=$(ynh_app_setting_get $app upstream_version)
# Check domain/path availability with app helper # Check domain/path availability with app helper
ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain." ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
@ -69,5 +70,5 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log
# Reload services # Reload services
systemctl reload nginx.service systemctl reload nginx.service
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
sleep 1 sleep 1

View File

@ -178,7 +178,7 @@ ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version)
set_access_settings set_access_settings
# Reload services # Reload services
ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
sleep 1 sleep 1
# Store the checksum with the 'INTERNAL_TOKEN' value. # Store the checksum with the 'INTERNAL_TOKEN' value.