Chris Vogel 1 год назад
Родитель
Сommit
e29eb3c75f
2 измененных файлов с 23 добавлено и 14 удалено
  1. 7 4
      scripts/install
  2. 16 10
      scripts/remove

+ 7 - 4
scripts/install

@@ -4,10 +4,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-# INITIALIZE AND STORE SETTINGS
-# @@ todo do we need to store the password un-encrypted somewhere on the system?
-ynh_app_setting_set --app=$app --key=password_couchdb_admin --value="$password_couchdb_admin"
-
 # https://codeberg.org/ChriChri/flohmarkt_ynh/issues/9
 # check if couchdb is already installed
 if [[ -e /opt/couchdb ]] || pgrep epmd > /dev/null || pgrep beam.smp || dpkg-query -W couchdb > /dev/null 2>&1; 
@@ -16,6 +12,13 @@ then
   exit 1
 fi
 
+# INITIALIZE AND STORE SETTINGS
+# todo: do we need to store the password un-encrypted somewhere on the system?
+# → there's no way to get the admin password later if sometimes in the future deleting
+#   the app will delete its specific database only (instead of the whole couchdb server as
+#   of now in the earliest versions of the integration).
+ynh_app_setting_set --app=$app --key=password_couchdb_admin --value="$password_couchdb_admin"
+
 # get port, admin_pw for already installed couchdb
 # skip the installation steps below
 ynh_script_progression --message="Installing CouchDB..." --weight=60

+ 16 - 10
scripts/remove

@@ -16,16 +16,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Removing system configurations related to $app..." --weight=5
 
-# remove flohmarkt database and database user
-ynh_script_progression --message="removing flohmarkt couchdb user and database" --weight=2
-# @@ wie komme ich hier an das admin-password, falls ich es brauche?
-#      * brauche ich es? → ja
-# db:
-# curl -X DELETE 'http://127.0.0.1:5984/flohmarkt' --user '<admin-user>:<admin-password>'
-# user:
-# curl -X DELETE "http://127.0.0.1:5984/_users/org.couchdb.user%3Aflohmarkt?rev=`curl -sX GET 'http://127.0.0.1:5984/_users/org.couchdb.user%3Aflohmarkt' --user 'admin:bla42fasel' | jq -r ._rev`" --user '<admin-user>:<admin-password>'
-
-
 # Stop flohmarkt service
 ynh_script_progression --message="Stopping $app..." --weight=2
 yunohost service stop $app
@@ -37,6 +27,22 @@ then
 	yunohost service remove $app
 fi
 
+ynh_script_progression --message="Stopping couchdb..." --weight=2
+systemctl stop couchdb
+
+ynh_script_progression --message="Removing database..." --weight=2
+# remove flohmarkt database and database user
+# ynh_script_progression --message="removing flohmarkt couchdb user and database" --weight=2
+# @@ wie komme ich hier an das admin-password, falls ich es brauche?
+#      * brauche ich es? → ja
+# db:
+# curl -X DELETE 'http://127.0.0.1:5984/flohmarkt' --user '<admin-user>:<admin-password>'
+# user:
+# curl -X DELETE "http://127.0.0.1:5984/_users/org.couchdb.user%3Aflohmarkt?rev=`curl -sX GET 'http://127.0.0.1:5984/_users/org.couchdb.user%3Aflohmarkt' --user 'admin:bla42fasel' | jq -r ._rev`" --user '<admin-user>:<admin-password>'
+# @@ todo improve this like above
+# https://codeberg.org/ChriChri/flohmarkt_ynh/issues/12
+rm -rf /var/lib/couchdb
+
 # Remove the app-specific logrotate config
 ynh_remove_logrotate