Merge pull request #1 from YunoHost-Apps/testing

!testme

README.md

@@ -53,8 +53,6 @@ Couchdb has it's own users management system, so LDAP is not supported.
 
 By default this package installs couchdb as single node, if you need a different setup, please contribute with pull requests to improve the package :)
 
-It seems that there are some conflicts between yunohost SSO cookies and couchdb authentication cookies, this results in users not being able to access couchdb if they are logged in the SSO. To avoid having this issue, it is recommended to install couchdb on a different domain than the main yunohost one.
-
 
 ## Links
 

README_fr.md

@@ -50,8 +50,6 @@ Couchdb a sa propre gestion d'utilisateurs, donc LDAP n'est pas supporté.
 
 Par défaut, ce paquet install couchdb comme nœud simple. Si vous souhaitez permettre des installations plus avancées les contributions sont bienvenues :)
 
-Il semble qu'il y'ai un conflit entre le cookie du SSO yunohost et celui d'autentification à couchdb, dont le résultat est que couchdb n'est pas accessible pour les utilisateurs s'ils sont loggé dans le SSO. La façon la plus simple d'éviter ce problème est d'installer couchdb sur un domaine différent que le domaine principale de yunohost.
-
 
 ## Liens
 

check_process

@@ -5,13 +5,10 @@
 
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
-		path="/path"	(PATH)
+		path="/path"
-		admin="john"	(USER)
+		is_public=1
-		language="fr"
-		is_public=1	(PUBLIC|public=1|private=0)
 		password="pass"
-		port="666"	(PORT)
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -20,16 +17,14 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=CommitHash
+		upgrade=1	from_commit=a0672d9a6fd70f594a149ada70ce5362e85c8390
 		backup_restore=1
-		multi_instance=1
+		multi_instance=0
 		port_already_use=0
 		change_url=1
 ;;; Options
-Email=
+Email=squeak@eauchat.org
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
+	; commit=a0672d9a6fd70f594a149ada70ce5362e85c8390
-		name=Name and date of the commit.
+		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&password=pass&
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
-

issue_template.md

@@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide
 1. *Read this whole template first.*
 2. *Determine if you are on the right place:*
    - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
-   - *Otherwise, the issue may be due to dato itself. Refer to [its documentation](https://squeak.eauchat.org/dato) or [repository](https://framagit.org/squeak/dato/issues) for help.*
+   - *Otherwise, the issue may be due to dato itself. Refer to [its documentation](https://docs.couchdb.org/en/stable/index.html) or [repository](https://github.com/apache/couchdb/issues/) for help.*
    - *When in doubt, post here and we will figure it out together.*
 3. *Delete the italic comments as you write over them below, and remove this guide.*
 ---
@@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide
 
 - *If you performed a command from the CLI, the command itself is enough. For example:*
     ```sh
-    sudo yunohost app install REPLACEBYYOURAPP
+    sudo yunohost app install couchdb
     ```
 - *If you used the webadmin, please perform the equivalent command from the CLI first.*
 - *If the error occurs in your browser, explain what you did:*

manifest.json

@@ -49,6 +49,10 @@
           "en": "Is it a public application?",
           "fr": "Est-ce une application publique ?"
         },
+        "help": {
+          "en": "If enabled, couchdb will be accessible without yunohost account on your server, but couchdb contains it's own user authentication system.",
+          "fr": "Si cette case est cochée, couchdb sera accessible aux personnes n’ayant pas de compte yunohost sur votre serveur, mais couchdb a son propre système d'autentification des utilisateurs."
+        },
         "default": true
       },
       {

scripts/install

@@ -102,9 +102,8 @@ couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
 couchdb couchdb/adminpass_again seen true" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
 
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
 
-# ynh_add_app_dependencies --package="ca-certificates" # done before, when installing dependencies
 ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb"
 # ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb" --key="https://apache.bintray.com/couchdb-deb/dists/buster/Release.gpg"
 
@@ -148,7 +147,7 @@ ynh_add_fail2ban_config --logpath="/var/log/couchdb/couchdb.log" --failregex="[w
 ynh_script_progression --message="Configuring permissions..." --weight=3
 
 # Setup that clicking SSO tile opens fauxton UI
-ynh_permission_url --permission="main" --url="/_utils/index.html" --add_url="/"
+ynh_permission_url --permission="main" --url="/_utils/index.html" --add_url="/" --auth_header=false
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]

scripts/remove

@@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 port=$(ynh_app_setting_get --app=$app --key=port)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # STANDARD REMOVE
@@ -40,6 +41,14 @@ ynh_script_progression --message="Removing dependencies..." --weight=16
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
+#=================================================
+# REMOVE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Removing app main directory..." --weight=4
+
+# Remove the app directory securely
+ynh_secure_remove --file="$final_path"
+
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================

scripts/restore

@@ -94,7 +94,7 @@ couchdb couchdb/adminpass_again password ${COUCHDB_PASSWORD}
 couchdb couchdb/adminpass_again seen true" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
 
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
 
 # ynh_add_app_dependencies --package="ca-certificates" # done before, when installing dependencies
 ynh_install_extra_app_dependencies --repo="https://apache.bintray.com/couchdb-deb buster main" --package="couchdb"