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

Merge pull request #23 from YunoHost-Apps/remove-check-var

Browse source 
Remove check var
This commit is contained in:
frju365 2019-02-15 00:45:49 +01:00 committed by GitHub
commit 55388b8631
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/_common.sh
View file

@ -1,12 +1,5 @@
#!/bin/bash #!/bin/bash
CHECK_VAR () { # Verifies that the variable is not empty.
# $1 = Variable to be checked
# $2 = Display text on error
test -n "$1" || (echo "$2" >&2 && false)
}
# Start (or other actions) a service, print a log in case of failure and optionnaly wait until the service is completely started # Start (or other actions) a service, print a log in case of failure and optionnaly wait until the service is completely started
# #
# usage: ynh_systemd_action [-n service_name] [-a action] [ [-l "line to match"] [-p log_path] [-t timeout] [-e length] ] # usage: ynh_systemd_action [-n service_name] [-a action] [ [-l "line to match"] [-p log_path] [-t timeout] [-e length] ]

7
scripts/install
View file

@ -39,8 +39,6 @@ app=$YNH_APP_INSTANCE_NAME
final_path=/var/www/$app final_path=/var/www/$app
test ! -e "$final_path" || ynh_die "This path already contains a folder" test ! -e "$final_path" || ynh_die "This path already contains a folder"
domain_regex=$(echo "$domain" | sed 's@-@.@g')
# Normalize the url path syntax # Normalize the url path syntax
path_url=$(ynh_normalize_url_path $path_url) path_url=$(ynh_normalize_url_path $path_url)
@ -48,7 +46,6 @@ path_url=$(ynh_normalize_url_path $path_url)
ynh_webpath_available $domain $path_url ynh_webpath_available $domain $path_url
# Register (book) web path # Register (book) web path
ynh_webpath_register $app $domain $path_url ynh_webpath_register $app $domain $path_url
CHECK_VAR "$domain_regex" "domain_regex empty"
#================================================= #=================================================
# FIND AND OPEN A PORT # FIND AND OPEN A PORT
@ -154,7 +151,7 @@ ynh_use_logrotate
# ADVERTISE SERVICE IN ADMIN PANEL # ADVERTISE SERVICE IN ADMIN PANEL
#================================================= #=================================================
yunohost service add $app --log "/var/log/$app.log" yunohost service add $app --log "/var/log/$app.log" --log "/var/www/$app/log/production.log"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
@ -167,7 +164,7 @@ then # If the app is private, only the shortened URLs are publics
if [ "$path_url" == "/" ]; then if [ "$path_url" == "/" ]; then
path_url="" path_url=""
fi fi
ynh_app_setting_set $app protected_regex "$domain_regex$path_url/login$","$domain_regex$path_url/logout$","$domain_regex$path_url/api$","$domain_regex$path_url/extensions$","$domain_regex$path_url/stats$","$domain_regex$path_url/d/.*$","$domain_regex$path_url/a$","$domain_regex$path_url/$" ynh_app_setting_set $app protected_regex "$domain$path_url/login$","$domain$path_url/logout$","$domain$path_url/api$","$domain$path_url/extensions$","$domain$path_url/stats$","$domain$path_url/d/.*$","$domain$path_url/a$","$domain$path_url/$"
else else
ynh_replace_string "#--PRIVATE--" "" "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_replace_string "#--PRIVATE--" "" "/etc/nginx/conf.d/$domain.d/$app.conf"
fi fi