1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/rainloop_ynh.git synced 2024-09-03 20:16:18 +02:00

Corrections after conflict merge

This commit is contained in:
Maniack Crudelis 2019-03-09 13:02:31 +01:00
parent 93ac70747c
commit 34b3db4c18
4 changed files with 13 additions and 17 deletions

View file

@ -37,8 +37,6 @@ Each user can add a remote carddav server from their own parameters interface.
- If you use baikal, the CardDav address is: https://DOMAIN.TLD/baikal/card.php/addressbooks/USER/default/ - If you use baikal, the CardDav address is: https://DOMAIN.TLD/baikal/card.php/addressbooks/USER/default/
- If you use NextCloud, the CardDav address is: https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts - If you use NextCloud, the CardDav address is: https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts
Rainloop saves your PGP private keys in the browser storage. This means that you will loose your private keys if you clear your browser storage (e.g., private browsing, different computer...). This packages integrates [PGPback by chtixof](https://github.com/chtixof/pgpback_ynh) so you can store your PGP private keys on the server securely. Go to **http://DOMAIN.TLD/rainloop/pgpback** to backup your PGP keys on the server or restore them.
## Documentation ## Documentation
* Official documentation: https://www.rainloop.net/docs/configuration/ * Official documentation: https://www.rainloop.net/docs/configuration/

View file

@ -51,19 +51,19 @@
}, },
"default": false "default": false
}, },
{ {
"name": "password", "name": "password",
"type": "password", "type": "password",
"ask": { "ask": {
"en": "Set the administrator password", "en": "Set the administrator password",
"fr": "Définissez le mot de passe administrateur" "fr": "Définissez le mot de passe administrateur"
}, },
"help": { "help": {
"en": "Use the help field to add an information for the admin about this question.", "en": "Use the help field to add an information for the admin about this question.",
"fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
}, },
"example": "Choose a password" "example": "Choose a password"
}, },
{ {
"name": "ldap", "name": "ldap",
"type": "boolean", "type": "boolean",

View file

@ -166,7 +166,6 @@ else
ynh_replace_string "__ROOTTOCHANGE__" "$path_url" "$final_path/index.php" ynh_replace_string "__ROOTTOCHANGE__" "$path_url" "$final_path/index.php"
fi fi
# Install PGPback by chtixof to allow users to backup/restore their PGP private keys on the server # Install PGPback by chtixof to allow users to backup/restore their PGP private keys on the server
cp -rf ../sources/pgpback "$final_path/" cp -rf ../sources/pgpback "$final_path/"

View file

@ -121,7 +121,6 @@ else
ynh_replace_string "__ROOTTOCHANGE__" "$path_url" "$final_path/index.php" ynh_replace_string "__ROOTTOCHANGE__" "$path_url" "$final_path/index.php"
fi fi
# Install PGPback by chtixof to allow users to backup/restore their PGP private keys on the server # Install PGPback by chtixof to allow users to backup/restore their PGP private keys on the server
cp -rf ../sources/pgpback "$final_path/" cp -rf ../sources/pgpback "$final_path/"