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

Use admin mail and add a little bit of cleanup

Browse source
This commit is contained in:
Jean-Baptiste Holcroft 2017-10-27 11:09:29 +02:00
parent 5428f67f0b
commit 99cb36cdcc
3 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/install
View file

@ -37,12 +37,12 @@ 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"
# 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")
# Check web path availability # Check web path availability
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"
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
@ -53,7 +53,6 @@ ynh_app_setting_set "$app" path_url "$path_url"
ynh_app_setting_set "$app" admin "$admin" ynh_app_setting_set "$app" admin "$admin"
ynh_app_setting_set "$app" language "$language" ynh_app_setting_set "$app" language "$language"
ynh_app_setting_set "$app" is_public "$is_public" ynh_app_setting_set "$app" is_public "$is_public"
ynh_app_setting_set "$app" public_site "$is_public"
#================================================= #=================================================
# STANDARD MODIFICATIONS # STANDARD MODIFICATIONS
@ -111,22 +110,23 @@ ynh_add_fpm_config
#================================================= #=================================================
config="$final_path/app/inc/config.php" config="$final_path/app/inc/config.php"
cp ../conf/config.php $config admin_mail=$(ynh_user_get_info "$admin" mail)
cp ../conf/config.php "$config"
# Change variables in configuration # Change variables in configuration
ynh_replace_string "__DBUSER__" "$dbuser" $config ynh_replace_string "__DBUSER__" "$dbuser" "$config"
ynh_replace_string "__DBPWD__" "$dbpass" $config ynh_replace_string "__DBPWD__" "$dbpass" "$config"
ynh_replace_string "__DBNAME__" "$db_name" $config ynh_replace_string "__DBNAME__" "$db_name" "$config"
ynh_replace_string "__ADMINMAIL__" "$admin" $config ynh_replace_string "__ADMINMAIL__" "$admin_mail" "$config"
ynh_replace_string "__LANGUAGE__" "$language" $config ynh_replace_string "__LANGUAGE__" "$language" "$config"
ynh_replace_string "__DOMAIN__" "$domain" $config ynh_replace_string "__DOMAIN__" "$domain" "$config"
ynh_replace_string "__PATH__" "$path_url" $config ynh_replace_string "__PATH__" "$path_url" "$config"
#================================================= #=================================================
# Replace logo image (default is FramaDate) # Replace logo image (default is FramaDate)
#================================================= #=================================================
cp ../img/logo.png $final_path/images cp ../img/logo.png "$final_path/images"
#================================================= #=================================================
# STORE THE CHECKSUM OF THE CONFIG FILE # STORE THE CHECKSUM OF THE CONFIG FILE
@ -140,7 +140,7 @@ ynh_store_file_checksum "$config"
#================================================= #=================================================
# Create log file # Create log file
touch $final_path/admin/stdout.log touch "$final_path/admin/stdout.log"
#================================================= #=================================================

3
scripts/restore
View file

@ -33,7 +33,6 @@ domain=$(ynh_app_setting_get "$app" domain)
path_url=$(ynh_app_setting_get "$app" path) path_url=$(ynh_app_setting_get "$app" path)
admin=$(ynh_app_setting_get "$app" admin) admin=$(ynh_app_setting_get "$app" admin)
is_public=$(ynh_app_setting_get "$app" is_public) is_public=$(ynh_app_setting_get "$app" is_public)
public_site=$(ynh_app_setting_get "$app" public_site)
db_name=$(ynh_app_setting_get "$app" db_name) db_name=$(ynh_app_setting_get "$app" db_name)
dbuser=$app dbuser=$app
final_path=$(ynh_app_setting_get "$app" final_path) final_path=$(ynh_app_setting_get "$app" final_path)
@ -42,7 +41,7 @@ final_path=$(ynh_app_setting_get "$app" final_path)
# CHECK IF THE APP CAN BE RESTORED # CHECK IF THE APP CAN BE RESTORED
#================================================ #================================================
ynh_webpath_available $domain $path_url \ ynh_webpath_available "$domain" "$path_url" \
|| ynh_die "Path not available: ${domain}${path_url}" || ynh_die "Path not available: ${domain}${path_url}"
test ! -d $final_path \ test ! -d $final_path \
|| ynh_die "There is already a directory: $final_path" || ynh_die "There is already a directory: $final_path"

52
scripts/upgrade
View file

@ -26,43 +26,49 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
path_url=$(ynh_app_setting_get "$app" path) path_url=$(ynh_app_setting_get "$app" path)
admin=$(ynh_app_setting_get "$app" admin) admin=$(ynh_app_setting_get "$app" admin)
public_site=$(ynh_app_setting_get "$app" public_site)
is_public=$(ynh_app_setting_get "$app" is_public) is_public=$(ynh_app_setting_get "$app" is_public)
db_name=$(ynh_app_setting_get $app db_name) db_name=$(ynh_app_setting_get "$app" db_name)
dbuser=$app dbuser=$app
dbpass=$(ynh_app_setting_get "$app" mysqlpwd) dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
final_path=$(ynh_app_setting_get "$app" final_path) final_path=$(ynh_app_setting_get "$app" final_path)
language=$(ynh_app_setting_get "$app" language)
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
#================================================= #=================================================
if [ -z "$is_public" ];
then
is_public=$(ynh_app_setting_get "$app" public_site)
ynh_app_setting_set "$app" is_public "$is_public"
ynh_app_setting_delete "$app" public_site
fi
# Fix is_public as a boolean value # Fix is_public as a boolean value
if [ "$is_public" = "Yes" ]; then if [ "$is_public" = "Yes" ]; then
ynh_app_setting_set $app is_public 1 ynh_app_setting_set "$app" is_public 1
is_public=1 is_public=1
elif [ "$is_public" = "No" ]; then elif [ "$is_public" = "No" ]; then
ynh_app_setting_set $app is_public 0 ynh_app_setting_set "$app" is_public 0
is_public=0 is_public=0
fi fi
# If db_name doesn't exist, create it # If db_name doesn't exist, create it
if [ -z $db_name ]; then if [ -z "$db_name" ]; then
db_name=$(ynh_sanitize_dbid $app) db_name=$(ynh_sanitize_dbid "$app")
ynh_app_setting_set $app db_name $db_name ynh_app_setting_set "$app" db_name "$db_name"
fi fi
# If final_path doesn't exist, create it # If final_path doesn't exist, create it
if [ -z $final_path ]; then if [ -z "$final_path" ]; then
final_path=/var/www/$app final_path=/var/www/$app
ynh_app_setting_set $app final_path $final_path ynh_app_setting_set "$app" final_path "$final_path"
fi fi
# make sure default language is set # make sure default language is set
language=$(ynh_app_setting_get "$app" language) if [ -z "$language" ];
if [[ "$language" = "" ]];
then then
language=$(grep LANGUE /var/www/$app/variables.php | grep -Po "'.*?'" | cut -d"'" -f2) language=$(grep LANGUE "/var/www/$app/variables.php" | grep -Po "'.*?'" | cut -d"'" -f2)
fi fi
#================================================= #=================================================
@ -83,10 +89,10 @@ ynh_abort_if_errors
#================================================= #=================================================
# 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")
# Check web path availability # Check web path availability
ynh_webpath_available $domain $path_url ynh_webpath_available "$domain" "$path_url"
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
@ -125,16 +131,16 @@ ynh_add_fpm_config
#================================================= #=================================================
config="$final_path/app/inc/config.php" config="$final_path/app/inc/config.php"
cp ../conf/config.php $config cp ../conf/config.php "$config"
# Change variables in configuration # Change variables in configuration
ynh_replace_string "__DBUSER__" "$dbuser" $config ynh_replace_string "__DBUSER__" "$dbuser" "$config"
ynh_replace_string "__DBPWD__" "$dbpass" $config ynh_replace_string "__DBPWD__" "$dbpass" "$config"
ynh_replace_string "__DBNAME__" "$db_name" $config ynh_replace_string "__DBNAME__" "$db_name" "$config"
ynh_replace_string "__ADMINMAIL__" "$admin" $config ynh_replace_string "__ADMINMAIL__" "$admin" "$config"
ynh_replace_string "__LANGUAGE__" "$language" $config ynh_replace_string "__LANGUAGE__" "$language" "$config"
ynh_replace_string "__DOMAIN__" "$domain" $config ynh_replace_string "__DOMAIN__" "$domain" "$config"
ynh_replace_string "__PATH__" "$path_url" $config ynh_replace_string "__PATH__" "$path_url" "$config"
#================================================= #=================================================
# Replace logo image (default is FramaDate) # Replace logo image (default is FramaDate)
@ -156,7 +162,7 @@ ynh_store_file_checksum "$config"
#================================================= #=================================================
# Create log file # Create log file
touch $final_path/admin/stdout.log touch "$final_path/admin/stdout.log"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION