Cleanup

scripts/backup

@@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
 	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
@@ -84,12 +83,6 @@ ynh_print_info "Backing up systemd configuration..."
 
 ynh_backup "/etc/systemd/system/$app.service"
 
-#=================================================
-# BACKUP A CRON FILE
-#=================================================
-
-#ynh_backup "/etc/cron.d/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/change_url

@@ -114,8 +114,6 @@ ynh_systemd_action --action=start --service_name=$app --log_path=systemd --line_
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
 
-### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.
-### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it.
 ynh_backup_if_checksum_is_different "$final_path/config.ini"
 # Recalculate and store the checksum of the file for the next upgrade.
 ynh_store_file_checksum "$final_path/$app/config/prod.secret.exs"

scripts/install

@@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
 	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
@@ -43,16 +42,6 @@ then
 	admin="test"
 fi
 
-### If it's a multi-instance app, meaning it can be installed several times independently
-### The id of the app as stated in the manifest is available as $YNH_APP_ID
-### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...)
-### The app instance name is available as $YNH_APP_INSTANCE_NAME
-###    - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample
-###    - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2
-###    - ynhexample__{N} for the subsequent installations, with N=3,4, ...
-### The app instance name is probably what interests you most, since this is
-### guaranteed to be unique. This is a good unique identifier to define installation path,
-### db names, ...
 app=$YNH_APP_INSTANCE_NAME
 
 #=================================================
@@ -60,8 +49,6 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 ynh_print_info "Validating installation parameters..."
 
-### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
-### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app"
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
@@ -94,11 +81,6 @@ ynh_app_setting_set "$app" random_key   "$random_key"
 #=================================================
 ynh_print_info "Configuring firewall ..."
 
-### Use these lines if you have to open a port for the application
-### `ynh_find_port` will find the first available port starting from the given port.
-### If you're not using these lines:
-###		- Remove the section "CLOSE A PORT" in the remove script
-
 # Find a free port
 port=$(ynh_find_port 8095)
 # Open this port
@@ -125,13 +107,6 @@ sudo rm erlang_solutions.asc
 #=================================================
 ynh_print_info "Installing dependencies ..."
 
-### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package.
-### Those deb packages will be installed as dependencies of this package.
-### If you're not using this helper:
-###		- Remove the section "REMOVE DEPENDENCIES" in the remove script
-###		- As well as the section "REINSTALL DEPENDENCIES" in the restore script
-###		- And the section "UPGRADE DEPENDENCIES" in the upgrade script
-
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
@@ -139,13 +114,6 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_print_info "Creating a PostgreSQL database..."
 
-### Use these lines if you need a database for the application.
-### `ynh_psql_test_if_first_run` will create a master password and set up global settings.
-### If you're not using these lines:
-###		- Remove the section "BACKUP THE POSTGRESQL DATABASE" in the backup script
-###		- Remove also the section "REMOVE THE POSTGRESQL DATABASE" in the remove script
-###		- As well as the section "RESTORE THE POSTGRESQL DATABASE" in the restore script
-
 db_name=$(ynh_sanitize_dbid $app)
 db_pwd=$(ynh_string_random 30)
 ynh_app_setting_set $app db_name $db_name
@@ -167,10 +135,6 @@ CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";"
 #=================================================
 ynh_print_info "Setting up source files ..."
 
-### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
-### downloaded from an upstream source, like a git repository.
-### `ynh_setup_source` use the file conf/app.src
-
 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
 git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app"
@@ -183,8 +147,6 @@ popd
 #=================================================
 ynh_print_info "Configuring nginx web server..."
 
-### `ynh_add_nginx_config` will use the file conf/nginx.conf
-
 # Create a dedicated nginx config
 ynh_add_nginx_config
 if [ $cache -eq 1 ]
@@ -207,25 +169,6 @@ ynh_print_info "Configuring system user ..."
 # Create a system user
 ynh_system_user_create "$app" "$final_path"
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_print_info "Configuring php-fpm ..."
-
-### `ynh_add_fpm_config` is used to set up a PHP config.
-### You can remove it if your app doesn't use PHP.
-### `ynh_add_fpm_config` will use the files conf/php-fpm.conf and conf/php-fpm.ini
-### If you're not using these lines:
-###		- You can remove these files in conf/.
-###		- Remove the section "BACKUP THE PHP-FPM CONFIGURATION" in the backup script
-###		- Remove also the section "REMOVE PHP-FPM CONFIGURATION" in the remove script
-###		- As well as the section "RESTORE THE PHP-FPM CONFIGURATION" in the restore script
-###		With the reload at the end of the script.
-###		- And the section "PHP-FPM CONFIGURATION" in the upgrade script
-
-# Create a dedicated php-fpm config
-#ynh_add_fpm_config
-
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -287,68 +230,13 @@ popd
 #=================================================
 ynh_print_info "Configuring a systemd service ..."
 
-### `ynh_systemd_config` is used to configure a systemd script for an app.
-### It can be used for apps that use sysvinit (with adaptation) or systemd.
-### Have a look at the app to be sure this app needs a systemd script.
-### `ynh_systemd_config` will use the file conf/systemd.service
-### If you're not using these lines:
-###		- You can remove those files in conf/.
-###		- Remove the section "BACKUP SYSTEMD" in the backup script
-###		- Remove also the section "STOP AND REMOVE SERVICE" in the remove script
-###		- As well as the section "RESTORE SYSTEMD" in the restore script
-###		- And the section "SETUP SYSTEMD" in the upgrade script
-
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# SETUP APPLICATION WITH CURL
-#=================================================
-
-### Use these lines only if the app installation needs to be finalized through
-### web forms. We generally don't want to ask the final user,
-### so we're going to use curl to automatically fill the fields and submit the
-### forms.
-
-# Set right permissions for curl install
-#chown -R $app: $final_path
-
-# Set the app as temporarily public for curl call
-ynh_print_info "Configuring ssowat ..."
-#ynh_app_setting_set $app skipped_uris "/"
-# Reload SSOwat config
-#yunohost app ssowatconf
-
-# Reload Nginx
-#systemctl reload nginx
-
-# Installation with curl
-ynh_print_info "Finalizing install ..."
-#ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3"
-
-# Remove the public access
-#if [ $is_public -eq 0 ]
-#then
-#	ynh_app_setting_delete $app skipped_uris
-#fi
-
-#=================================================
-# MODIFY A CONFIG FILE
-#=================================================
-
-### `ynh_replace_string` is used to replace a string in a file.
-### (It's compatible with sed regular expressions syntax)
-
-#ynh_replace_string "match_string" "replace_string" "$final_path/$app/config/prod.secret.exs"
-
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
 
-### `ynh_store_file_checksum` is used to store the checksum of a file.
-### That way, during the upgrade script, by using `ynh_backup_if_checksum_is_different`,
-### you can make a backup of this file before modifying it again if the admin had modified it.
-
 # Calculate and store the config file checksum into the app settings
 ynh_store_file_checksum "$final_path/$app/config/prod.secret.exs"
 
@@ -358,10 +246,6 @@ ynh_store_file_checksum "$final_path/$app/config/prod.secret.exs"
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-### For security reason, any app should set the permissions to root: before anything else.
-### Then, if write authorization is needed, any access should be given only to directories
-### that really need such authorization.
-
 # Set permissions to app files
 chown -R "$app":"$app" "$final_path"
 
@@ -370,14 +254,6 @@ chown -R "$app":"$app" "$final_path"
 #=================================================
 ynh_print_info "Configuring log rotation ..."
 
-### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app.
-### Use this helper only if there is effectively a log file for this app.
-### If you're not using this helper:
-###		- Remove the section "BACKUP LOGROTATE" in the backup script
-###		- Remove also the section "REMOVE LOGROTATE CONFIGURATION" in the remove script
-###		- As well as the section "RESTORE THE LOGROTATE CONFIGURATION" in the restore script
-###		- And the section "SETUP LOGROTATE" in the upgrade script
-
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate
 
@@ -385,14 +261,6 @@ ynh_use_logrotate
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
-### `yunohost service add` is a CLI yunohost command to add a service in the admin panel.
-### You'll find the service in the 'services' section of YunoHost admin panel.
-### This CLI command would be useless if the app does not have any services (systemd or sysvinit)
-### If you're not using these lines:
-###		- You can remove these files in conf/.
-###		- Remove the section "REMOVE SERVICE FROM ADMIN PANEL" in the remove script
-###		- As well as the section ADVERTISE SERVICE IN ADMIN PANEL" in the restore script
-
 #yunohost service add $app --log "/var/log/$app/APP.log"
 # if using yunohost version 3.2 or more in the 'manifest.json', a description can be added
 yunohost service add $app --description "$app daemon for Pleroma" --log "/var/log/$app/$app.log"

scripts/remove

@@ -37,7 +37,7 @@ then
 fi
 
 #=================================================
-# START SERVICE
+# STOP SERVICE
 #=================================================
 
 ynh_systemd_action --action=stop --service_name=$app
@@ -94,14 +94,6 @@ ynh_print_info "Removing nginx web server configuration"
 ynh_remove_nginx_config
 ynh_secure_remove "/etc/nginx/conf.d/$app-cache.conf"
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_print_info "Removing php-fpm configuration"
-
-# Remove the dedicated php-fpm config
-#ynh_remove_fpm_config
-
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
@@ -127,9 +119,6 @@ fi
 # REMOVE THE CRON FILE
 #=================================================
 
-# Remove a cron file
-#ynh_secure_remove "/etc/cron.d/$app"
-
 # Remove a directory securely
 ynh_secure_remove "/etc/$app/"
 

scripts/restore

@@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	#### Remove this function if there's nothing to clean before calling the remove script.
 	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
@@ -81,12 +80,6 @@ ynh_system_user_create "$app" "$final_path"
 # Restore permissions on app files
 chown -R "$app":"$app" "$final_path"
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-
-#ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf"
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
@@ -145,12 +138,6 @@ systemctl daemon-reload
 
 yunohost service add $app --description "$app daemon for Pleroma" --log "/var/log/$app/$app.log"
 
-#=================================================
-# RESTORE THE CRON FILE
-#=================================================
-
-#ynh_restore_file "/etc/cron.d/$app"
-
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
 #=================================================
@@ -162,9 +149,8 @@ ynh_restore_file "/etc/logrotate.d/$app"
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_print_info "Reloading nginx web server and php-fpm..."
+ynh_print_info "Reloading nginx web server..."
 
-#systemctl reload php7.0-fpm
 systemctl reload nginx
 
 #=================================================

scripts/upgrade

@@ -32,17 +32,6 @@ cache=$(ynh_app_setting_get "$app" cache)
 size=$(ynh_app_setting_get "$app" size)
 registration=$(ynh_app_setting_get "$app" registration)
 
-psql_db=$(ynh_app_setting_get "$app" psql_db)
-
-if [ -n "$psql_db" ]
-then
-    db_name=$(ynh_app_setting_get "$app" psql_db)
-    db_pwd=$(ynh_app_setting_get "$app" psqlpwd)
-    ynh_app_setting_set "$app" db_name "$db_name"
-    ynh_app_setting_set "$app" db_pwd "$db_pwd"
-	ynh_app_setting_delete "$app" psql_db
-	ynh_app_setting_delete "$app" psqlpwd
-fi
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -73,6 +62,27 @@ fi
 # Remove repository
 ynh_secure_remove "/etc/apt/sources.list.d/erlang-solutions.list"
 
+#Switch variables name
+psql_db=$(ynh_app_setting_get "$app" psql_db)
+
+if [ -n "$psql_db" ]
+then
+    db_name=$(ynh_app_setting_get "$app" psql_db)
+    db_pwd=$(ynh_app_setting_get "$app" psqlpwd)
+    ynh_app_setting_set "$app" db_name "$db_name"
+    ynh_app_setting_set "$app" db_pwd "$db_pwd"
+	ynh_app_setting_delete "$app" psql_db
+	ynh_app_setting_delete "$app" psqlpwd
+fi
+
+#Close a port
+
+if yunohost firewall list | grep -q "\- $port$"
+then
+	echo "Close port $port" >&2
+	yunohost firewall disallow TCP $port 2>&1
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@@ -174,14 +184,6 @@ ynh_print_info "Making sure dedicated system user exists..."
 # Create a dedicated user (if not existing)
 ynh_system_user_create "$app" "$final_path"
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_print_info "Upgrading php-fpm configuration..."
-
-# Create a dedicated php-fpm config
-#ynh_add_fpm_config
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -228,22 +230,10 @@ pushd $final_path/$app
 	ynh_replace_string "administrator@example.com" "$admin_email" "$final_path/$app/config/prod.secret.exs" 
 popd
 
-### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.
-### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it.
 ynh_backup_if_checksum_is_different "$final_path/$app/config/prod.secret.exs"
 # Recalculate and store the checksum of the file for the next upgrade.
 ynh_store_file_checksum "$final_path/$app/config/prod.secret.exs"
 
-#=================================================
-# CLOSE A PORT
-#=================================================
-
-if yunohost firewall list | grep -q "\- $port$"
-then
-	echo "Close port $port" >&2
-	yunohost firewall disallow TCP $port 2>&1
-fi
-
 #=================================================
 # SETUP LOGROTATE
 #=================================================