mirror of
https://github.com/YunoHost-Apps/cryptpad_ynh.git
synced 2024-09-03 18:26:14 +02:00
Merge branch 'testing' into auto-helpers-2.1
This commit is contained in:
eric_G
GitHub
commit
451e6817e1
8 changed files with 12 additions and 35 deletions
|
|
@ -3,7 +3,7 @@ We have added the mandatory sandbox domain for you but you still need to configu
|
|||
Once CryptPad is installed, create an account via the Register button on the home page. To make this account an instance administrator:
|
||||
|
||||
1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key
|
||||
2. Paste this key in `/var/www/cryptpad/config/config.js` in the following array (uncomment and replace the placeholder):
|
||||
2. Paste this key in `__INSTALL_DIR__/config/config.js` in the following array (uncomment and replace the placeholder):
|
||||
```
|
||||
adminKeys: [
|
||||
"[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Nous avons ajouté le domaine obligatoire sandbox pour vous mais vous devez enco
|
|||
Une fois CryptPad installé, créez un compte via le bouton S'inscrire sur la page d'accueil. Pour faire de ce compte un administrateur d'instance :
|
||||
|
||||
1. Copiez la clé publique trouvée dans le menu utilisateur (avatar en haut à droite) > Paramètres > Compte > Clé de signature publique
|
||||
2. Collez cette clé dans `/var/www/cryptpad/config/config.js` dans le tableau suivant (décommentez et remplacez l'espace réservé) :
|
||||
2. Collez cette clé dans `__INSTALL_DIR__/config/config.js` dans le tableau suivant (décommentez et remplacez l'espace réservé) :
|
||||
```
|
||||
adminKeys: [
|
||||
"[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Once CryptPad is installed, create an account via the Sign Up button on the home
|
|||
To make this account an instance administrator:
|
||||
|
||||
1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key
|
||||
2. Paste this key in `/var/www/cryptpad/config/config.js` in the following array (uncomment and replace the placeholder):
|
||||
2. Paste this key in `__INSTALL_DIR__/config/config.js` in the following array (uncomment and replace the placeholder):
|
||||
|
||||
```
|
||||
adminKeys: [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ If not already done, then you can please open CryptPad domain: https://__DOMAIN_
|
|||
|
||||
Create an account via the Register button on the home page. To make this account an instance administrator:
|
||||
1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key
|
||||
2. Paste this key in /var/www/cryptpad/config/config.js in the following array (uncomment and replace the placeholder):
|
||||
2. Paste this key in __INSTALL_DIR__/config/config.js in the following array (uncomment and replace the placeholder):
|
||||
adminKeys: [
|
||||
"[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -19,12 +19,15 @@ cpe = "cpe:2.3:a:xwiki:cryptpad"
|
|||
fund = "https://opencollective.com/cryptpad/contribute?language=fr"
|
||||
|
||||
[integration]
|
||||
yunohost = ">= 11.2.18"
|
||||
yunohost = ">= 11.2.29"
|
||||
helpers_version = "2.1"
|
||||
architectures = "all"
|
||||
multi_instance = false
|
||||
|
||||
ldap = false
|
||||
|
||||
sso = false
|
||||
|
||||
disk = "50M"
|
||||
ram.build = "350M"
|
||||
ram.runtime = "50M"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
|
||||
source ../settings/scripts/_common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
|
|
@ -13,17 +12,11 @@ ynh_print_info "Declaring files to be backed up..."
|
|||
ynh_backup "$install_dir"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE NGINX CONFIGURATION
|
||||
# SYSTEM CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC BACKUP
|
||||
#=================================================
|
||||
# BACKUP SYSTEMD
|
||||
#=================================================
|
||||
|
||||
ynh_backup "/etc/systemd/system/$app.service"
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ ynh_script_progression "Adding system configurations related to $app..."
|
|||
# Create a dedicated NGINX config
|
||||
ynh_config_add_nginx
|
||||
|
||||
env_path="$PATH"
|
||||
# Create a dedicated systemd config
|
||||
ynh_config_add_systemd
|
||||
|
||||
|
|
@ -74,16 +73,12 @@ ynh_script_progression "Adding $app's configuration..."
|
|||
|
||||
ynh_config_add --template="config.js" --destination="$install_dir/config/config.js"
|
||||
|
||||
#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 600 "$install_dir/config/config.js"
|
||||
#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app "$install_dir/config/config.js"
|
||||
|
||||
#=================================================
|
||||
# INSTALL CRYPTPAD
|
||||
#=================================================
|
||||
ynh_script_progression "Building $app... (this will take some time and resources!)"
|
||||
|
||||
pushd "$install_dir"
|
||||
|
||||
ynh_hide_warnings npm install --allow-root
|
||||
ynh_hide_warnings npm install -g bower
|
||||
ynh_hide_warnings bower install --allow-root
|
||||
|
|
|
|||
|
|
@ -20,18 +20,9 @@ ynh_systemctl --service=$app --action="stop"
|
|||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
ynh_script_progression "Upgrading source files..."
|
||||
|
||||
# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed
|
||||
if ynh_app_upstream_version_changed
|
||||
then
|
||||
ynh_script_progression "Upgrading source files..."
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir" #--keep="config/config.js"
|
||||
|
||||
#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
|
||||
#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:$app "$install_dir"
|
||||
fi
|
||||
ynh_setup_source --dest_dir="$install_dir" #--keep="config/config.js"
|
||||
|
||||
#=================================================
|
||||
# APPLY FOLDER GROUP RIGHTS FOR WWW-DATA
|
||||
|
|
@ -75,7 +66,6 @@ ynh_script_progression "Upgrading NGINX web server configuration..."
|
|||
# Create a dedicated NGINX config
|
||||
ynh_config_add_nginx
|
||||
|
||||
env_path="$PATH"
|
||||
#=================================================
|
||||
# UPGRADE DEPENDENCIES
|
||||
#=================================================
|
||||
|
|
@ -89,7 +79,6 @@ ynh_nodejs_install
|
|||
ynh_script_progression "Building $app... (this will take some time and resources!)"
|
||||
|
||||
pushd "$install_dir"
|
||||
|
||||
ynh_hide_warnings npm install --allow-root
|
||||
ynh_hide_warnings npm install -g bower
|
||||
ynh_hide_warnings bower update --allow-root
|
||||
|
|
@ -100,7 +89,7 @@ popd
|
|||
#=================================================
|
||||
# CREATE SYSTEMD SERVICE
|
||||
#=================================================
|
||||
# Create a dedicated systemd config
|
||||
|
||||
ynh_config_add_systemd
|
||||
|
||||
yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log"
|
||||
|
|
@ -112,9 +101,6 @@ ynh_script_progression "Updating configuration..."
|
|||
|
||||
ynh_config_add --template="config.js" --destination="$install_dir/config/config.js"
|
||||
|
||||
#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 600 "$install_dir/config/config.js"
|
||||
#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app "$install_dir/config/config.js"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Reference in a new issue