YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Merge pull request #66 from labriqueinternet/cleanup

Browse source 
Cleanup
This commit is contained in:
Alexandre Aubin 2020-10-12 20:48:38 +02:00 • committed by GitHub
commit 73476e02fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
conf/ynh-hotspot
View file

@ -256,11 +256,25 @@ ynh_setting_get() {
}
ynh_setting_set() {
app=${1}
setting=${2}
value=${3}
yunohost app setting "${app}" "${setting}" -v "${value}"
# This is a partial copypasta of the official ynh_app_setting internal helper
# In particular, we do this instead of relying on 'yunohost app setting' for
# performance reasons (it takes a few second to run every yunohost commands)
# and to remove the need for the infamous '--need-lock' option/issue.
app="$1" key="$2" value="${3:-}" python2.7 - <<EOF
import os, yaml, sys
app = os.environ['app']
key, value = os.environ['key'], os.environ.get('value', None)
setting_file = "/etc/yunohost/apps/%s/settings.yml" % app
assert os.path.exists(setting_file), "Setting file %s does not exists ?" % setting_file
with open(setting_file) as f:
settings = yaml.load(f)
settings[key] = value
with open(setting_file, "w") as f:
yaml.safe_dump(settings, f, default_flow_style=False)
EOF
}
devfromid() {
@ -275,12 +289,6 @@ devfromid() {
if [ "$1" != restart ]; then
# Restart php7.0-fpm at the first start (it needs to be restarted after the slapd start)
if [ ! -e /tmp/.ynh-hotspot-boot ]; then
touch /tmp/.ynh-hotspot-boot
systemctl restart php__PHPVERSION__-fpm
fi
# Variables
echo -n "Retrieving Yunohost settings... "

2
manifest.json
View file

@ -7,7 +7,7 @@
"fr": "Hotspot Wifi"
},
"url": "https://github.com/labriqueinternet/hotspot_ynh",
"version": "1.2.0~ynh2",
"version": "1.2.0~ynh3",
"license": "AGPL-3.0",
"maintainer": {
"name": "Julien Vaubourg",

10
scripts/install
View file

@ -309,7 +309,7 @@ fi
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock
yunohost service add $service_name --description "Creates a Wi-Fi access point"
#=================================================
# START SYSTEMD SERVICE
@ -323,14 +323,6 @@ else
ynh_systemd_action --service_name=$service_name --action="start" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot"
fi
#=================================================
# RELOAD NGINX AND PHP-FPM
#=================================================
ynh_script_progression --message="Reloading nginx web server..."
ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
ynh_systemd_action --service_name=nginx --action=reload
#=================================================
# END OF SCRIPT
#=================================================

2
scripts/restore
View file

@ -136,7 +136,7 @@ systemctl enable $service_name.service
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock
yunohost service add $service_name --description "Creates a Wi-Fi access point"
#=================================================
# START SYSTEMD SERVICE

2
scripts/upgrade
View file

@ -199,7 +199,7 @@ find ${final_path}/ -type d -exec chmod +x {} \;
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock
yunohost service add $service_name --description "Creates a Wi-Fi access point"
#=================================================
# START SYSTEMD SERVICE