Merge pull request #118 from YunoHost-Apps/revert-116-testing

Revert "4.12.1"
2024-09-03 18:26:14 +02:00 · 2021-11-27 12:10:46 +01:00 · 2021-11-27 12:10:46 +01:00 · c93e475474
commit c93e475474
parent a532186b30 5ec12864f0
11 changed files with 21 additions and 40 deletions
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@ -63,7 +63,7 @@ echo "Handling asset at $asset_url"
 # Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
 # Leave $src empty to ignore the asset
 case $asset_url in
-  *".tar.gz")
+  *".tar.gz"*)
    src="app"
    ;;
 esac
@ -117,6 +117,9 @@ done
 # GENERIC FINALIZATION
 #=================================================

+# Install moreutils, needed for sponge
+sudo apt-get install moreutils
+
 # Replace new version in manifest
 echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json

--- a/README.md
+++ b/README.md
@ -17,7 +17,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:** 4.12.1~ynh1
+**Shipped version:** 4.12.0~ynh1

 **Demo:** https://cryptpad.fr/

--- a/README_fr.md
+++ b/README_fr.md
@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 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 :** 4.12.1~ynh1
+**Version incluse :** 4.12.0~ynh1

 **Démo :** https://cryptpad.fr/

--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.12.1.tar.gz
-SOURCE_SUM=5caf45e9c1f11e6b6a1d9bd201d53b6be690a03f651ca61d056f09be7d48c26c
+SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.11.0.tar.gz
+SOURCE_SUM=e529b484c297f73227f991971189c51f64da1ab53fc78334d1fb08e320d4385e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -1,5 +1,10 @@
 location ^~ / {

+    # Force usage of https
+    if ($scheme = http) {
+    rewrite ^ https://$server_name$request_uri? permanent;
+    }
+
    proxy_pass http://127.0.0.1:__PORT__;
    proxy_redirect    off;
    proxy_set_header  Host $host;
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "Zero Knowledge realtime collaborative editor",
        "fr": "Éditeur chiffré collaboratif en temps réel"
    },
-    "version": "4.12.1~ynh1",
+    "version": "4.12.0~ynh1",
    "url": "https://cryptpad.fr/",
    "upstream": {
        "license": "AGPL-3.0-only",
@ -22,7 +22,7 @@
        "url": "https://frju365.yunohost.support"
    },
    "requirements": {
-        "yunohost": ">= 4.3.2"
+        "yunohost": ">= 4.2.4"
    },
    "multi_instance": false,
    "services": [
--- a/scripts/backup
+++ b/scripts/backup
@ -46,11 +46,7 @@ ynh_backup --src_path="$final_path"
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"

 #=================================================
-# BACKUP LOGROTATE
-#=================================================
-
-ynh_backup --src_path="/etc/logrotate.d/$app"
-
+# SPECIFIC BACKUP
 #=================================================
 # BACKUP SYSTEMD
 #=================================================
--- a/scripts/change_url
+++ b/scripts/change_url
@ -107,7 +107,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1

-ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving content"
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server available"

 #=================================================
 # RELOAD NGINX
--- a/scripts/install
+++ b/scripts/install
@ -112,7 +112,7 @@ ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --targ
 ynh_add_systemd_config

 #=================================================
-# CONFIGURE CONFIG.JS
+# CONFIGURE CONFIG.JS	
 #=================================================

 ynh_add_config --template="../conf/config.js" --destination="$final_path/config/config.js"
@ -131,14 +131,6 @@ pushd "$final_path"
 	ynh_exec_warn_less bower install --allow-root
 popd

-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=1
-
-# Use logrotate to manage application logfile(s)
-ynh_use_logrotate
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
@ -152,7 +144,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e
 ynh_script_progression --message="Starting a systemd service..." --weight=2

 # Start a systemd service
-ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Serving content"
+ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="server available"

 #=================================================
 # SETUP SSOWAT
--- a/scripts/restore
+++ b/scripts/restore
@ -84,13 +84,6 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet

-#=================================================
-# RESTORE THE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/logrotate.d/$app"
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
@ -103,7 +96,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1

-ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving content"
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server available"

 #=================================================
 # GENERIC FINALIZATION
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -139,14 +139,6 @@ ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --targ
 # Create a dedicated systemd config
 ynh_add_systemd_config

-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
-
-# Use logrotate to manage app-specific logfile(s)
-ynh_use_logrotate --non-append
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
@ -159,7 +151,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1

-ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving content"
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server available"

 #=================================================
 # RELOAD NGINX