doc/PRE_INSTALL.md

doc/PRE_INSTALL.md

@@ -1,16 +1,19 @@
-### Exclusive use of couchdb 
+## Warning: Exclusive use of couchdb 
 
 flohmarkt expects to install CouchDB from the Apache repository for its own, exclusive use. Installation might break already existing installs of CouchDB.
 
+**flohmarkt will probably not install if you're already running an instance of a couchdb**
+
+https://codeberg.org/flohmarkt/flohmarkt_ynh/src/commit/7721103bac61787f31a4b2f2ae695c65d4f26fc9/scripts/install#L9
 https://codeberg.org/ChriChri/flohmarkt_ynh/issues/9
 
-### Exclusive use of (sub)domain 
+## Exclusive use of (sub)domain 
 
 flohmarkt expects to bei installed on its own (sub)domain.
 
 https://codeberg.org/ChriChri/flohmarkt_ynh/issues/4 .
 
-### No integration in yunohost user database"
+## No integration in yunohost user database"
 
 flohmarkt mainanins its own user database in CouchDB. Users have to register to flohmarkt to get an account. Registration cannot be restricted to yunohost users.
 
@@ -18,17 +21,17 @@ https://codeberg.org/ChriChri/flohmarkt_ynh/issues/5 .
 
 ## removing after installation
 
-**Warning:** This will probably break any existing installation of couchdb (there's an couchdb app to install just couchdb and expose its port via nginx reverse-proxy).
+**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.
 
-## read before test installation
+https://codeberg.org/flohmarkt/flohmarkt_ynh/src/commit/7721103bac61787f31a4b2f2ae695c65d4f26fc9/scripts/remove#L44
 
-**Another warning:** 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.
+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.
 
-**This is really strictly for testing only - don't install on a production yunohost.**
+## list of instances
 
-## Go ahead…
+We apreciate a lot if you run an instance of flohmarkt and will publish your [instance on the wiki](https://codeberg.org/flohmarkt/flohmarkt/wiki/flohmarkt-instances) if you [open an issue](https://codeberg.org/flohmarkt/flohmarkt/issues) asking us to do so.
 
-…test, break stuff and open issues on codeberg :) !
+If you're looking for another instance to federate with the list on the wiki is a good starting point also.
 
 # help welcome
 
@@ -36,3 +39,4 @@ You're welcome to take part by opening issues or sending pull requests. You can
 
 I also announced this work on the [yunohost forum](https://forum.yunohost.org/t/ynh-flohmarkt-flohmarkt-as-an-app-for-yunohost/28455?u=chrichri).
 
+Look at [DEVELOPMENT.md](doc/DEVELOPMENT.md) for more information.

scripts/install

@@ -122,10 +122,8 @@ chmod 640 "/var/log/$app/$app.log"
 ynh_systemd_action --service_name=$app --action="start"
 
 # SETUP FAIL2BAN
-# no need for couchdb, because it will not listen externally
+# @@ todo
 # ynh_script_progression --message="Configuring 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/$app/$app.log" --failregex="<HOST>:" --max_retry=5
 
 ynh_script_progression --message="Installation of $app completed" --last