From 0ae9486e44267e39d736b5864c1d26ba52d80536 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 10 Jan 2022 15:36:34 +0100 Subject: [PATCH] Fix --- check_process | 8 ++------ conf/.env | 2 ++ scripts/change_url | 6 ------ scripts/install | 10 +++++----- scripts/restore | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) create mode 100644 conf/.env diff --git a/check_process b/check_process index 3237f00..0c93ecb 100644 --- a/check_process +++ b/check_process @@ -1,15 +1,11 @@ ;; Test complet ; Manifest domain="domain.tld" - path="/path" - admin="john" - language="fr" + path="/" is_public=1 - password="1Strong-Password" - port="666" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 diff --git a/conf/.env b/conf/.env new file mode 100644 index 0000000..516e376 --- /dev/null +++ b/conf/.env @@ -0,0 +1,2 @@ +SHIORI_DBTYPE=mysql +SHIORI_DSN=__DB_USER__:__DB_PWD__@(localhost)/__DB_NAME__?charset=utf8&parseTime=True&loc=Local \ No newline at end of file diff --git a/scripts/change_url b/scripts/change_url index 11f740d..f5bfd03 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -100,12 +100,6 @@ then ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -# ... -#================================================= - #================================================= # GENERIC FINALISATION #================================================= diff --git a/scripts/install b/scripts/install index ddae58d..1431fbe 100755 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE #================================================= -# ynh_script_progression --message="Creating a MySQL database..." --time --weight=1 +# ynh_script_progression --message="Creating a MySQL database..." --weight=2 # db_name=$(ynh_sanitize_dbid --db_name=$app) # db_user=$db_name @@ -120,12 +120,12 @@ chown -R $app:www-data "$datadir" #================================================= # ADD A CONFIGURATION #================================================= -# ynh_script_progression --message="Adding a configuration file..." --time --weight=1 +# ynh_script_progression --message="Adding a configuration file..." --weight=1 -# ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" +# ynh_add_config --template="../conf/.env" --destination="$final_path/.env" -# chmod 400 "$final_path/some_config_file" -# chown $app:$app "$final_path/some_config_file" +# chmod 400 "$final_path/.env" +# chown $app:$app "$final_path/.env" #================================================= # SETUP SYSTEMD diff --git a/scripts/restore b/scripts/restore index fad054b..38bf6e9 100755 --- a/scripts/restore +++ b/scripts/restore @@ -122,7 +122,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Simple bookmark manager" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE