Merge pull request #178 from YunoHost-Apps/testing

Testing

.github/workflows/updater.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run the updater script
@@ -33,7 +33,7 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update to version ${{ env.VERSION }}

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 CryptPad is a collaboration suite that is end-to-end-encrypted and open-source. It is built to enable collaboration, synchronizing changes to documents in real time. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.
 
-**Shipped version:** 5.2.1~ynh4
+**Shipped version:** 5.2.1~ynh2
 
 **Demo:** https://cryptpad.fr/
 

README_fr.md

@@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 CryptPad est une suite de collaboration chiffrée de bout en bout et open source. Il est conçu pour permettre la collaboration, en synchronisant les modifications apportées aux documents en temps réel. Étant donné que toutes les données sont chiffrées, le service et ses administrateurs n'ont aucun moyen de voir le contenu modifié et stocké. 
 
-**Version incluse :** 5.2.1~ynh4
+**Version incluse :** 5.2.1~ynh2
 
 **Démo :** https://cryptpad.fr/
 

manifest.json

@@ -6,7 +6,7 @@
         "en": "Zero Knowledge realtime collaborative office suite",
         "fr": "Suite bureautique chiffrée pour la collaboration en temps réel"
     },
-    "version": "5.2.1~ynh4",
+    "version": "5.2.1~ynh2",
     "url": "https://cryptpad.fr/",
     "upstream": {
         "license": "AGPL-3.0-only",

scripts/upgrade

@@ -123,7 +123,7 @@ ynh_script_progression --message="Setting up sandobx domain: $sandboxdomain" --w
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	# If sandboxdomain doesn't exist, create it
-	if [ -z "$sandboxdomain" ]; then
+	if [ -n "$sandboxdomain" ]; then
 		yunohost domain add $sandboxdomain
 		yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0"
 	fi
@@ -192,7 +192,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin
 #=================================================
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	ynh_add_config --template="/etc/nginx/conf.d/$domain.d/cryptpad.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/cryptpad.conf"
+	if [ -n "$sandboxdomain" ]; then
+		ynh_add_config --template="nginx.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/$app.conf"
+	fi
 fi
 
 # We authorize access to sandbox domain