Просмотр исходного кода

still found errors on the way to ynh5

Chris Vogel 1 год назад
Родитель
Сommit
93b7ec25b8
4 измененных файлов с 14 добавлено и 2 удалено
  1. 9 0
      doc/ADMIN.md
  2. 1 1
      doc/POST_INSTALL.md
  3. 1 1
      scripts/_common.sh
  4. 3 0
      scripts/remove

+ 9 - 0
doc/ADMIN.md

@@ -16,3 +16,12 @@ Please refer to https://codeberg.org/flohmarkt/flohmarkt_ynh/ to take part in de
 
 
 More about development of **flohmarkt**s yunohost integration can be found in [DEVELOPMENT.md](DEVELOPMENT.md)
 More about development of **flohmarkt**s yunohost integration can be found in [DEVELOPMENT.md](DEVELOPMENT.md)
 
 
+## removing this app
+
+Removing a flohmarkt instance will **delete all of its data** for the time being. If you remove a flohmarkt **we strongly suggest to make a backup** beforehand. This [issue](https://codeberg.org/flohmarkt/flohmarkt_ynh/issues/29) describes how we'll handle `remove` with and without `--purge` in the future.
+
+**Warning:** This might break any existing installation of couchdb (there's an couchdb app to install just couchdb and expose its port via nginx reverse-proxy and possibly other software installing a couchdb). This could happen if you installed the couchdb app after you installed flohmarkt.
+
+https://codeberg.org/flohmarkt/flohmarkt_ynh/src/commit/7721103bac61787f31a4b2f2ae695c65d4f26fc9/scripts/remove#L44
+
+When installing flohmarkt on a a domain and letting it talk to other ActivityPub instances it will propagate a key associated to your domain. If you remove your flohmarkt from that domain and loose that key other instances might not want to talk to you anymore after you installed flohmarkt again on the same domain generating a new key.

+ 1 - 1
doc/POST_INSTALL.md

@@ -2,7 +2,7 @@
 
 
 To finish your flohmarkt setup you'll need to open its setup URL. 
 To finish your flohmarkt setup you'll need to open its setup URL. 
 
 
-You can find the setup URL in flohmarkts logfile in /var/log/flohmarkt… if you look for entries like this:
+You can find the setup URL in flohmarkts logfile in /var/log/__APP__ if you look for entries like this:
 
 
 ```
 ```
 2024-05-06 16:30:24 Flohmarkt is not initialized yet. Please go to 
 2024-05-06 16:30:24 Flohmarkt is not initialized yet. Please go to 

+ 1 - 1
scripts/_common.sh

@@ -147,7 +147,7 @@ flohmarkt_ynh_exists_couchdb_user() {
 }
 }
 
 
 flohmarkt_ynh_exists_couchdb_db() {
 flohmarkt_ynh_exists_couchdb_db() {
-  if [[ $( curl -sX GET "http://127.0.0.1:5984/flohmarkt__22" --user admin:blafasel \
+  if [[ $( curl -sX GET "http://127.0.0.1:5984/flohmarkt__22" --user "admin:${password_couchdb_admin}" \
     | jq .error ) == '"not_found"' ]]
     | jq .error ) == '"not_found"' ]]
   then
   then
     false
     false

+ 3 - 0
scripts/remove

@@ -65,8 +65,11 @@ ynh_remove_systemd_config
 # remove symlinks
 # remove symlinks
 ynh_script_progression --message="Removing symlinks..." --weight=2
 ynh_script_progression --message="Removing symlinks..." --weight=2
 ynh_secure_remove --file="$flohmarkt_sym_install"
 ynh_secure_remove --file="$flohmarkt_sym_install"
+rm "$flohmarkt_sym_install" || true
 ynh_secure_remove --file="$flohmarkt_sym_data_dir"
 ynh_secure_remove --file="$flohmarkt_sym_data_dir"
+rm "$flohmarkt_sym_data_dir" || true
 ynh_secure_remove --file="$flohmarkt_sym_log_dir"
 ynh_secure_remove --file="$flohmarkt_sym_log_dir"
+rm "$flohmarkt_sym_log_dir" || true
 
 
 #=================================================
 #=================================================
 # END OF SCRIPT
 # END OF SCRIPT