Merge pull request 'upgrade_script' (#27) from upgrade_script into main

Reviewed-on: https://codeberg.org/ChriChri/flohmarkt_ynh/pulls/27

manifest.toml

@@ -6,7 +6,7 @@ id = "flohmarkt"
 name = "flohmarkt"
 description.en = "A decentral federated small ads platform"
 
-version = "0.0~ynh1"
+version = "0.0~ynh2"
 
 maintainers = ["Chris Vogel"]
 
@@ -109,8 +109,8 @@ ram.runtime = "100M"
     # This will pre-fetch the asset which can then be deployed during the install/upgrade scripts with :
     #    ynh_setup_source --dest_dir="$install_dir"
     # You can also define other assets than "main" and add --source_id="foobar" in the previous command
-    url = "https://codeberg.org/flohmarkt/flohmarkt/archive/490a748cc3a6698c8a6400df3fa9cfdcf4fd76da.tar.gz"
-    sha256 = "45d40fb96c9997502755939d0ba6bac9df39d3ca30d271be01b69202b88839fb"
+    url = "https://codeberg.org/flohmarkt/flohmarkt/archive/0edd928adb76d72ecad2f768f25a8cc89f0c2eb1.tar.gz"
+    sha256 = "68978e04077d12c54f1b574c6da11c368c9da37f453e6768520deac88ea21855"
 
     # These infos are used by https://github.com/YunoHost/apps/blob/master/tools/autoupdate_app_sources/autoupdate_app_sources.py
     # to auto-update the previous asset urls and sha256sum + manifest version

scripts/install

@@ -57,11 +57,6 @@ chmod 640 /opt/couchdb/etc/local.d/05-flohmarkt.ini
 systemctl restart couchdb
 systemctl status couchdb
 
-# INTEGRATE SERVICE IN YUNOHOST
-# would this work? couchdb brings its own systemd.service...
-# ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-# yunohost service add $app --description="war mal couchdb" --log="/var/log/$app/$app.log"
-
 # get flohmarkt
 ynh_setup_source --dest_dir="$install_dir/$app/"
 
@@ -105,7 +100,6 @@ ynh_add_config --template="../conf/flohmarkt.conf" --destination="$install_dir/$
 # SETUP LOGROTATE
 ynh_script_progression --message="Configuring log rotation..." --weight=2
 # Use logrotate to manage application logfile(s)
-# @@ how does this know where the logfiles are?
 ynh_use_logrotate
 
 # NGINX CONFIGURATION
@@ -130,6 +124,4 @@ ynh_systemd_action --service_name=$app --action="start"
 # # Create a dedicated Fail2Ban config
 # ynh_add_fail2ban_config --logpath="/var/log/couchdb/couchdb.log" --failregex="[warning] .*couch_httpd_auth: Authentication failed for user .+ from <HOST>" --max_retry=5
 
-# @@ logrotation
-
 ynh_script_progression --message="Installation of $app completed" --last

scripts/upgrade

@@ -1,90 +1,104 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
+# UPGRADE_PACKAGE if only the YunoHost package has changed
+# UPGRADE_APP if the upstream app version has changed
+# DOWNGRADE
+# UPGRADE_SAME
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_script_progression --message="Stopping flohmarkt and CouchDB..." --weight=5
+# stop flohmarkt
+ynh_systemd_action --service_name=$app --action="stop"
+# stop couchdb
+ynh_systemd_action --service_name=couchdb --action="stop"
+
+# upgrade couchdb
+ynh_script_progression --message="Upgrading CouchDB..." --weight=50
+echo "\
+couchdb couchdb/mode select standalone
+couchdb couchdb/mode seen true
+couchdb couchdb/bindaddress string 127.0.0.1
+couchdb couchdb/bindaddress seen true
+couchdb couchdb/cookie string $couchdb_magic_cookie
+couchdb couchdb/adminpass password $password_couchdb_admin
+couchdb couchdb/adminpass seen true
+couchdb couchdb/adminpass_again password $password_couchdb_admin
+couchdb couchdb/adminpass_again seen true" | debconf-set-selections
+DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
+ynh_install_extra_app_dependencies \
+	--repo="deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main" \
+	--key="https://couchdb.apache.org/repo/keys.asc" \
+	--package="couchdb"
+
+# upgrade couchdb config
+ynh_script_progression --message="Updating couchdb configuration file..." --weight=1
+ynh_add_config --template="../conf/05-flohmarkt.ini" --destination="/opt/couchdb/etc/local.d/05-flohmarkt.ini"
+chown root:couchdb /opt/couchdb/etc/local.d/05-flohmarkt.ini
+chmod 640 /opt/couchdb/etc/local.d/05-flohmarkt.ini
+
+# start couchdb to pick up changes
+ynh_script_progression --message="Starting couchdb..." --weight=1
+ynh_systemd_action --service_name=couchdb --action="start"
+systemctl status couchdb
+
+# install upgrade for flohmarkt
+ynh_script_progression --message="Upgrading flohmarkt..." --weight=4
+ynh_setup_source --dest_dir="$install_dir/$app/"
+
+ynh_script_progression --message="Upgrading flohmarkt python dependencies..." --weight=5
+# upgrade python environment / install new dependencies
+(
+    set +o nounset
+    source "$install_dir/venv/bin/activate"
+    set -o nounset
+    set -x
+    $install_dir/venv/bin/python3 -m ensurepip
+    $install_dir/venv/bin/pip3 install -r "$install_dir/$app/requirements.txt"
+)
+
+# upgrade flohmarkt.conf
+ynh_script_progression --message="Upgrading flohmarkt configuration..." --weight=1
+ynh_add_config --template="../conf/flohmarkt.conf" --destination="$install_dir/$app/flohmarkt.conf"
+
+ynh_script_progression --message="Upgrading flohmarkt couchdb..." --weight=10
+# run initialize_couchdb.py
+(
+    set +o nounset
+    source "$install_dir/venv/bin/activate"
+    set -o nounset
+    cd "$install_dir/$app"
+    # initialize_couchdb seems to re-try on connect problems endlessly blocking the yunohost api
+    # give it 45 seconds to finish and then fail
+    # https://codeberg.org/ChriChri/flohmarkt_ynh/issues/13
+    timeout 45 python3 initialize_couchdb.py $password_couchdb_admin $password_couchdb_flohmarkt
+)
+
+# systemd service upgrade
+ynh_script_progression --message="Upgrading flohmarkt systemd service..." --weight=1
+ynh_add_systemd_config
+# INTEGRATE SERVICE IN YUNOHOST
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
+yunohost service add $app --description="A decentral federated small advertisement platform" --log="/var/log/$app/$app.log"
 
-#=================================================
-# SPECIFIC UPGRADE
-#=================================================
-# UPGRADING COUCHDB
-#=================================================
-
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading CouchDB..." --weight=50
-
-	echo "\
-	couchdb couchdb/mode select standalone
-	couchdb couchdb/mode seen true
-	couchdb couchdb/bindaddress string 127.0.0.1
-	couchdb couchdb/bindaddress seen true
-	couchdb couchdb/cookie string $password
-	couchdb couchdb/adminpass password $password
-	couchdb couchdb/adminpass seen true
-	couchdb couchdb/adminpass_again password $password
-	couchdb couchdb/adminpass_again seen true" | debconf-set-selections
-	DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
-
-	ynh_install_extra_app_dependencies \
-		--repo="deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main" \
-		--key="https://couchdb.apache.org/repo/keys.asc" \
-		--package="couchdb"
-fi
-
-#=================================================
-# UPDATE A CONFIG FILE
-#=================================================
-ynh_script_progression --message="Updating a configuration file..." --weight=1
-
-ynh_add_config --template="../conf/05-flohmarkt.ini" --destination="$install_dir/etc/local.d/05-flohmarkt.ini"
-
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R "$app:$app" "$install_dir"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP LOGROTATE
-#=================================================
+# upgrade logrotate
 ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
-
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
-
-yunohost service add $app --description="A decentral federated small advertisement platform" --log="/var/log/$app/$app.log"
+# upgrade nginx configuration
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
+ynh_add_nginx_config
 
-#=================================================
 # UPGRADE FAIL2BAN
-#=================================================
-ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=3
-
+# ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=3
 # Create a dedicated Fail2Ban config
-ynh_add_fail2ban_config --logpath="/var/log/couchdb/couchdb.log" --failregex="[warning] .*couch_httpd_auth: Authentication failed for user .+ from <HOST>" --max_retry=5
+# ynh_add_fail2ban_config --logpath="/var/log/couchdb/couchdb.log" --failregex="[warning] .*couch_httpd_auth: Authentication failed for user .+ from <HOST>" --max_retry=5
 
-#=================================================
-# END OF SCRIPT
-#=================================================
+# start flohmarkt
+ynh_script_progression --message="Starting flohmarkt..." --weight=3
+ynh_systemd_action --service_name=$app --action="start" --line_match="INFO:     Application startup complete."
 
 ynh_script_progression --message="Upgrade of $app completed" --last