diff --git a/README.md b/README.md index 06842b6..edce6bf 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,8 @@ adminKeys: [ ], ``` +3. Restart CryptPad service (In YunoHost webadmin -> Services -> cryptpad -> Restart) + ## Documentation and resources * Official app website: https://cryptpad.fr/ diff --git a/README_fr.md b/README_fr.md index 28272bc..235eab2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,6 +34,7 @@ adminKeys: [ "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", ], ``` +3. Redémarrer le service CryptPad ## Documentations et ressources diff --git a/conf/nginx.conf b/conf/nginx.conf index 6f67957..1fd74de 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ 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; diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index bdc64b0..ea2cf42 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -9,3 +9,5 @@ adminKeys: [ "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", ], ``` + +3. Restart CryptPad service (In YunoHost webadmin -> Services -> cryptpad -> Restart) diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 9de6f5c..6f6fe40 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -9,4 +9,5 @@ adminKeys: [ "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", ], ``` + 3. Redémarrer le service CryptPad (Dans webadmin YunoHost -> Services -> cryptpad -> Redémarrer) diff --git a/manifest.json b/manifest.json index dc4451c..dbe6564 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "url": "https://frju365.yunohost.support" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 23c4c4d..6dbebbe 100644 --- a/scripts/install +++ b/scripts/install @@ -107,8 +107,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0cafe05..ec81c07 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,8 +134,7 @@ popd #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config