1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/moodle_ynh.git synced 2024-09-03 19:46:23 +02:00

Revert "Cleaning up"

This reverts commit 77a7722924.
This commit is contained in:
ericgaspar 2021-02-05 14:21:48 +01:00
parent 90364a46f5
commit edfa0ea45b
No known key found for this signature in database
GPG key ID: 574F281483054D44
4 changed files with 37 additions and 38 deletions

View file

@ -24,7 +24,7 @@ domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN
is_public=$YNH_APP_ARG_IS_PUBLIC
email=$(ynh_user_get_info --username=$admin --key=mail)
email=$(ynh_user_get_info "$admin" mail)
password=$(ynh_string_random --length=30)
app=$YNH_APP_INSTANCE_NAME
@ -40,17 +40,17 @@ data_path=/home/yunohost.app/$app
test ! -e "$data_path" || ynh_die --message="This path already contains a folder"
# Register (book) web path
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
ynh_webpath_register --app="$app" --domain="$domain" --path_url="$path_url"
#=================================================
# STORE SETTINGS FROM MANIFEST
#=================================================
ynh_script_progression --message="Storing installation settings..." --weight=1
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=admin --value=$admin
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app="$app" --key=domain --value="$domain"
ynh_app_setting_set --app="$app" --key=path --value="$path_url"
ynh_app_setting_set --app="$app" --key=admin --value="$admin"
ynh_app_setting_set --app="$app" --key=is_public --value="$is_public"
#=================================================
# STANDARD MODIFICATIONS
@ -59,7 +59,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public
#=================================================
ynh_script_progression --message="Installing dependencies..." --weight=1
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
ynh_install_app_dependencies "$pkg_dependencies"
#=================================================
# CREATE POSTGRESQL DATABASE
@ -73,16 +73,16 @@ db_user=$db_name
ynh_app_setting_set --app="$app" --key=db_name --value="$db_name"
ynh_psql_setup_db --db_user="$db_user" --db_name="$db_name"
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
db_pwd=$(ynh_app_setting_get "$app" psqlpwd)
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
ynh_script_progression --message="Setting up source files..." --weight=6
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
ynh_app_setting_set --app="$app" --key=final_path --value="$final_path"
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir=$final_path
ynh_setup_source --dest_dir="$final_path"
#=================================================
# NGINX CONFIGURATION
@ -98,7 +98,7 @@ ynh_add_nginx_config
ynh_script_progression --message="Configuring system user..." --weight=2
# Create a system user
ynh_system_user_create --username=$app
ynh_system_user_create --username="$app"
#=================================================
# PHP-FPM CONFIGURATION
@ -106,8 +106,8 @@ ynh_system_user_create --username=$app
ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
# Create a dedicated php-fpm config
ynh_add_fpm_config --package=$extra_php_dependencies
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
ynh_add_fpm_config --package="$extra_php_dependencies"
phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
#=================================================
# SPECIFIC SETUP
@ -115,11 +115,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
# SECURE FILES AND DIRECTORIES
#=================================================
ynh_app_setting_set --app=$app --key=data_path --value=$data_path
mkdir -p $data_path
chown -R $app: $data_path
chown -R $app: $final_path
ynh_app_setting_set --app="$app" --key=data_path --value="$data_path"
mkdir -p "$data_path"
chown -R $app: "$data_path"
chown -R $app: "$final_path"
#=================================================
# SETUP APPLICATION
@ -170,8 +169,8 @@ ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion
ynh_script_progression --message="Securing files and directories..." --weight=1
# Set permissions to app files
chown -R $app: $data_path
chown -R $app: $final_path
chown -R $app: "$data_path"
chown -R $app: "$final_path"
#=================================================
# SETUP SSOWAT

View file

@ -16,11 +16,11 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
domain=$(ynh_app_setting_get --app="$app" --key=domain)
db_name=$(ynh_app_setting_get --app="$app" --key=db_name)
db_user=$db_name
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
data_path=$(ynh_app_setting_get --app=$app --key=data_path)
final_path=$(ynh_app_setting_get --app="$app" --key=final_path)
data_path=$(ynh_app_setting_get --app="$app" --key=data_path)
#=================================================
# STANDARD REMOVE

View file

@ -96,7 +96,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
ynh_script_progression --message="Reinstalling dependencies..." --weight=3
# Define and install dependencies
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
ynh_install_app_dependencies "$pkg_dependencies"
#=================================================
# RESTORE THE POSTGRESQL DATABASE

View file

@ -16,13 +16,13 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path)
admin=$(ynh_app_setting_get --app=$app --key=admin)
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
data_path=$(ynh_app_setting_get --app=$app --key=data_path)
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
domain=$(ynh_app_setting_get --app="$app" --key=domain)
path_url=$(ynh_app_setting_get --app="$app" --key=path)
admin=$(ynh_app_setting_get --app="$app" --key=admin)
is_public=$(ynh_app_setting_get --app="$app" --key=is_public)
final_path=$(ynh_app_setting_get --app="$app" --key=final_path)
data_path=$(ynh_app_setting_get --app="$app" --key=data_path)
db_name=$(ynh_app_setting_get --app="$app" --key=db_name)
#=================================================
# CHECK VERSION
@ -88,7 +88,7 @@ ynh_add_nginx_config
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=1
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
ynh_install_app_dependencies $pkg_dependencies
#=================================================
# CREATE DEDICATED USER
@ -105,7 +105,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --package="$extra_php_dependencies"
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
#=================================================
# SPECIFIC UPGRADE
@ -126,8 +126,8 @@ ynh_store_file_checksum --file="$final_path/config.php"
#=================================================
# Set permissions on app files
chown -R $app: $data_path
chown -R $app: $final_path
chown -R $app: "$data_path"
chown -R $app: "$final_path"
#=================================================
# ACTIVATE LDAP SUPPORT
@ -168,8 +168,8 @@ ynh_replace_string "__PHPVERSION__" "$phpversion" "/etc/cron.d/$app"
ynh_script_progression --message="Securing files and directories..." --weight=1
# Set permissions on app files
chown -R $app: $data_path
chown -R $app: $final_path
chown -R $app: "$data_path"
chown -R $app: "$final_path"
#=================================================
# RELOAD NGINX