YunoHost-Apps/cryptpad_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/cryptpad_ynh.git synced 2024-09-03 18:26:14 +02:00
Code Issues Activity Actions

Merge pull request #94 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2021-06-04 12:01:47 +02:00 committed by GitHub
commit 198d9d2bbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 39 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/inst
## Overview
CryptPad is a collaborative encrypted document editor in real time. It is a privacy-friendly alternative to popular office tools and cloud services. All content stored in CryptPad is encrypted before being sent, which means that no one can access your data unless you give them the keys. You can share access to a document simply by sharing the link.
**Shipped version:** 4.5.0
**Shipped version:** 4.6.0
## Screenshots

2
README_fr.md
View file

@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install)
## Vue d'ensemble
CryptPad est un éditeur de documents chiffrés collaboratifs en temps réel. C'est une alternative respectant la vie privée aux outils office et aux services cloud populaires. Tout le contenu stocké dans CryptPad est chiffré avant d'être envoyé, ce qui signifie que personne ne peut accéder à vos données à moins que vous ne leur donniez les clés. Vous pouvez partager l'accès à un document simplement en partageant le lien.
**Version incluse :** 4.5.0
**Version incluse :** 4.6.0
## Captures d'écran

14
check_process
View file

@ -1,9 +1,9 @@
;; Nom du test
auto_remove=1
; Manifest
domain="domain.tld" (DOMAIN)
admin="john" (USER)
is_public="1" (PUBLIC|public=1|private=0)
domain="domain.tld"
admin="john"
is_public="1"
; Checks
pkg_linter=1
setup_sub_dir=0
@ -12,10 +12,6 @@
setup_private=1
setup_public=1
upgrade=1
#3.24.0
upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1
#4.0.0
upgrade=1 from_commit=4b43c2fd8731a9d08196c4d1b688922ff6b39f00
#4.1.0
upgrade=1 from_commit=b0dd9be98e3cfedec24d3910058682b36e3fedda
#4.2.1
@ -29,10 +25,6 @@
Email=
Notification=none
;;; Upgrade options
; commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1
name=update to 3.24.0
; commit=4b43c2fd8731a9d08196c4d1b688922ff6b39f00
name=update to 4.0.0
; commit=b0dd9be98e3cfedec24d3910058682b36e3fedda
name=update to 4.1.0
; commit=63f434a721fdea008ff5171b18131afa8d47c140

6
conf/app.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.5.0.tar.gz
SOURCE_SUM=f61aa69f25cd4551eb2990488bac9ec1699b7d1823cef6e47c5a9110128527bc
SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.6.0.tar.gz
SOURCE_SUM=d723fec493b1254946015ce7d40b8cc3ca528d558bf434fd26742fbc5b5a1f12
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=cryptpad-4.5.0.tar.gz
SOURCE_FILENAME=cryptpad-4.6.0.tar.gz

2
conf/nginx.conf
View file

@ -3,7 +3,7 @@ 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;

3
doc/DISCLAIMER.md Normal file
View file

@ -0,0 +1,3 @@
## Configuration
* How to configure this app: From the admin panel and the plain file `/var/www/cryptpad/config/config.js.`

3
doc/DISCLAIMER_fr.md Normal file
View file

@ -0,0 +1,3 @@
## Configuration
Comment configurer cette application : via le panneau d'administration ainsi que le fichier de configuration `/var/www/cryptpad/config/config.js`.

BIN
doc/screenshots/screenshot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 116 KiB

12
manifest.json
View file

@ -6,8 +6,16 @@
"en": "Zero Knowledge realtime collaborative editor",
"fr": "Éditeur chiffré collaboratif en temps réel."
},
"version": "4.5.0~ynh2",
"version": "4.6.0~ynh1",
"url": "https://cryptpad.fr/",
"upstream": {
"license": "AGPL-3.0-only",
"website": "https://cryptpad.fr/",
"demo": "https://cryptpad.fr/",
"admindoc": "https://docs.cryptpad.fr/en/",
"userdoc": "https://yunohost.org/apps",
"code": "https://github.com/xwiki-labs/cryptpad"
},
"license": "AGPL-3.0-only",
"maintainer": {
"name": "frju365",
@ -15,7 +23,7 @@
"url": "https://frju365.yunohost.support"
},
"requirements": {
"yunohost": ">= 4.1.7"
"yunohost": ">= 4.2.4"
},
"multi_instance": false,
"services": [

14
scripts/install
View file

@ -90,6 +90,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path"
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:$app "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
@ -113,6 +117,7 @@ ynh_add_systemd_config
#=================================================
ynh_add_config --template="../conf/config.js" --destination="$final_path/config/config.js"
chmod 600 "$final_path/config/config.js"
#=================================================
# INSTALL CRYPTPAD
@ -126,15 +131,6 @@ pushd "$final_path" || ynh_die
ynh_exec_warn_less bower install --allow-root
popd || ynh_die
#=================================================
# Set some permissions
#=================================================
ynh_script_progression --message="Securing files and directories..." --weight=1
chown -R $app:$app $final_path
chmod -R o-rwx $final_path
chmod 600 "$final_path/config/config.js"
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================

9
scripts/restore
View file

@ -64,13 +64,10 @@ ynh_script_progression --message="Restoring CryptPad main directory..." --weight
ynh_restore_file --origin_path="$final_path"
#=================================================
# RESTORE USER RIGHTS
#=================================================
# Restore permissions on app files
chown -R $app: $final_path
chmod -R o-rwx $final_path
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:$app "$final_path"
chmod 600 "$final_path/config/config.js"
#=================================================

28
scripts/upgrade
View file

@ -87,20 +87,13 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..." --weight=1
# Create a temporary directory
tmpdir="$(mktemp -d)"
# Backup the config file in the temp dir
cp -a "$final_path/config/config.js" "$tmpdir/config.js"
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path"
# Copy the admin saved settings from tmp directory to final path
cp -a "$tmpdir/config.js" "$final_path/config/config.js"
# Remove the tmp directory securely
ynh_secure_remove --file="$tmpdir"
ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.js"
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:$app "$final_path"
chmod 600 "$final_path/config/config.js"
fi
#=================================================
@ -148,15 +141,6 @@ ynh_replace_string --match_string="__YNH_NPM__" --replace_string="$ynh_npm" --ta
# Create a dedicated systemd config
ynh_add_systemd_config
#=================================================
# SECURE FILES AND DIRECTORIES
#=================================================
# Set permissions on app files
chown -R $app: $final_path
chmod -R o-rwx $final_path
chmod 600 "$final_path/config/config.js"
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================