Merge pull request #1 from YunoHost-Apps/env

Env

check_process

@@ -16,7 +16,7 @@
 		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
 		multi_instance=1
-		change_url=0
+		change_url=1
 ;;; Options
 Email=
 Notification=none

conf/.env

@@ -3,17 +3,17 @@
 # Set binding values
 COMMENTO_ORIGIN=https://__DOMAIN__
 COMMENTO_PORT=__PORT__
-COMMENTO_STATIC=__FINALPATH__/
+COMMENTO_STATIC=__FINALPATH__
 
 # Set PostgreSQL settings
 COMMENTO_POSTGRES=postgres://__DB_USER__:__DB_PWD__@127.0.0.1:5432/__DB_NAME__?sslmode=disable
 
 # Set the SMTP credentials
-COMMENTO_SMTP_HOST=localhost
+#COMMENTO_SMTP_HOST=localhost
-COMMENTO_SMTP_PORT=25
+#COMMENTO_SMTP_PORT=25
-COMMENTO_SMTP_USERNAME=example@__DOMAIN__
+#COMMENTO_SMTP_USERNAME=admin@__DOMAIN__
-COMMENTO_SMTP_PASSWORD=
+#COMMENTO_SMTP_PASSWORD=
-COMMENTO_SMTP_FROM_ADDRESS=no-reply@commento.io
+#COMMENTO_SMTP_FROM_ADDRESS=no-reply@__DOMAIN__
 
 # Set Google OAuth credentials
 COMMENTO_GOOGLE_KEY=

conf/systemd.service

@@ -1,16 +1,13 @@
 [Unit]
-Description=Commento daemon service
+Description=Commento: commenting platform
 After=network.target postgresql.service
 
 [Service]
 Type=simple
 User=__APP__
 Group=__APP__
+Environment=COMMENTO_CONFIG_FILE=__FINALPATH__/commento.env
 ExecStart=__FINALPATH__/commento
-Environment=COMMENTO_ORIGIN=https://__DOMAIN__
-Environment=COMMENTO_PORT=__PORT__
-Environment=COMMENTO_POSTGRES=postgres://__DB_USER__:__DB_PWD__@127.0.0.1:5432/__DB_NAME__?sslmode=disable
-Environment=COMMENTO_STATIC=__FINALPATH__
 
 [Install]
 WantedBy=multi-user.target

scripts/change_url

@@ -17,7 +17,7 @@ old_domain=$YNH_APP_OLD_DOMAIN
 old_path=$YNH_APP_OLD_PATH
 
 new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
+new_path="/"
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -28,6 +28,10 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
@@ -100,6 +104,17 @@ then
 	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 fi
 
+#=================================================
+# ADD A CONFIGURATION
+#=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
+
+domain="$new_domain"
+ynh_add_config --template="../conf/.env" --destination="$final_path/commento.env"
+
+chmod 400 "$final_path/commento.env"
+chown $app:$app "$final_path/commento.env"
+
 #=================================================
 # GENERIC FINALISATION
 #=================================================

scripts/install

@@ -106,15 +106,15 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-# #=================================================
+#=================================================
-# # ADD A CONFIGURATION
+# ADD A CONFIGURATION
-# #=================================================
+#=================================================
-# ynh_script_progression --message="Adding a configuration file..." --weight=1
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-# ynh_add_config --template="../conf/.env" --destination="$final_path/.env"
+ynh_add_config --template="../conf/.env" --destination="$final_path/commento.env"
 
-# chmod 400 "$final_path/.env"
+chmod 400 "$final_path/commento.env"
-# chown $app:$app "$final_path/.env"
+chown $app:$app "$final_path/commento.env"
 
 #=================================================
 # SETUP SYSTEMD

scripts/upgrade

@@ -83,7 +83,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# 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" --keep="$final_path/commento.env"
 fi
 
 chmod 750 "$final_path"
@@ -110,10 +110,10 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 # #=================================================
 # ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-# ynh_add_config --template="../conf/.env" --destination="$final_path/.env"
+# ynh_add_config --template="../conf/.env" --destination="$final_path/commento.env"
 
-# chmod 400 "$final_path/.env"
+# chmod 400 "$final_path/commento.env"
-# chown $app:$app "$final_path/.env"
+# chown $app:$app "$final_path/commento.env"
 
 #=================================================
 # SETUP SYSTEMD