1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00

Merge pull request #429 from YunoHost-Apps/Add-is-public-argument

Add is_public argument
This commit is contained in:
Kayou 2021-09-06 12:07:29 +02:00 committed by GitHub
commit b83e51e8d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 10 deletions

View file

@ -54,8 +54,8 @@ this package:
## Documentation and resources
* Official app website: https://nextcloud.com
* Official user documentation: https://yunohost.org/en/app_nextcloud
* Official admin documentation: https://docs.nextcloud.com/server/21/user_manual/en/
* Official user documentation: https://docs.nextcloud.com/server/latest/user_manual/en/
* Official admin documentation: https://docs.nextcloud.com/server/stable/admin_manual/
* Upstream app code repository: https://github.com/nextcloud/server
* YunoHost documentation for this app: https://yunohost.org/app_nextcloud
* Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues

View file

@ -49,8 +49,8 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
## Documentations et ressources
* Site officiel de l'app : https://nextcloud.com
* Documentation officielle utilisateur : https://yunohost.org/en/app_nextcloud
* Documentation officielle de l'admin : https://docs.nextcloud.com/server/21/user_manual/en/
* Documentation officielle utilisateur : https://docs.nextcloud.com/server/latest/user_manual/en/
* Documentation officielle de l'admin : https://docs.nextcloud.com/server/stable/admin_manual/
* Dépôt de code officiel de l'app : https://github.com/nextcloud/server
* Documentation YunoHost pour cette app : https://yunohost.org/app_nextcloud
* Signaler un bug : https://github.com/YunoHost-Apps/nextcloud_ynh/issues

View file

@ -3,14 +3,15 @@
domain="domain.tld"
path="/path"
admin="homer"
is_public=1
user_home="1"
; Checks
pkg_linter=1
setup_sub_dir=1
setup_root=1
setup_nourl=0
setup_private=0
setup_public=0
setup_private=1
setup_public=1
upgrade=1
#19.0.3
upgrade=1 from_commit=a03e25fac417e2e03e53ed3a7b7ed05185637360

View file

@ -12,8 +12,8 @@
"license": "AGPL-3.0",
"website": "https://nextcloud.com",
"demo": "https://demo.nextcloud.com/",
"admindoc": "https://docs.nextcloud.com/server/21/user_manual/en/",
"userdoc": "https://yunohost.org/en/app_nextcloud",
"admindoc": "https://docs.nextcloud.com/server/stable/admin_manual/",
"userdoc": "https://docs.nextcloud.com/server/latest/user_manual/en/",
"code": "https://github.com/nextcloud/server"
},
"license": "AGPL-3.0",
@ -48,6 +48,15 @@
"type": "user",
"example": "homer"
},
{
"name": "is_public",
"type": "boolean",
"help": {
"en": "If enabled, Nextcloud will be accessible by Nextcloud Desktop and by users without a YunoHost account. This can be changed later in the webadmin.",
"fr": "Si cette case est cochée, Nextcloud sera accessible par Nextcloud Desktop et par les utilisateurs nayant pas de compte YunoHost. Vous pourrez changer dans la webadmin."
},
"default": true
},
{
"name": "user_home",
"type": "boolean",

View file

@ -64,7 +64,7 @@ ynh_mysql_dump_db --database="$db_name" > db.sql
# BACKUP LOGROTATE
#=================================================
ynh_backup "/etc/logrotate.d/$app"
ynh_backup --src_path="/etc/logrotate.d/$app"
#=================================================
# BACKUP FAIL2BAN CONFIGURATION

View file

@ -24,6 +24,7 @@ domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN
user_home=$YNH_APP_ARG_USER_HOME
is_public=$YNH_APP_ARG_IS_PUBLIC
app=$YNH_APP_INSTANCE_NAME
@ -331,7 +332,13 @@ ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" -
#=================================================
# SETUP SSOWAT
#=================================================
ynh_script_progression --message="Configuring SSOwat..."
ynh_script_progression --message="Configuring permissions..."
# Make app public if necessary
if [ $is_public -eq 1 ]
then
ynh_permission_update --permission="main" --add="visitors"
fi
ynh_permission_create --permission="api" --label="api" --url="re:$domain\/.well-known\/.*" --allowed="visitors" "all_users" --auth_header="false" --show_tile="false" --protected="true"

View file

@ -134,6 +134,10 @@ mkdir -p "$datadir"
# Fix app ownerships & permissions
chown -R $app: "$final_path" "$datadir"
find $final_path/ -type f -print0 | xargs -0 chmod 0644
find $final_path/ -type d -print0 | xargs -0 chmod 0755
find $datadir/ -type f -print0 | xargs -0 chmod 0640
find $datadir/ -type d -print0 | xargs -0 chmod 0750
chmod 640 "$final_path/config/config.php"
chmod 755 /home/yunohost.app

View file

@ -70,6 +70,13 @@ if [ -z "$phpversion" ]; then
phpversion="$YNH_PHP_VERSION"
fi
# Cleaning legacy permissions
if ynh_legacy_permissions_exists; then
ynh_legacy_permissions_delete_all
ynh_app_setting_delete --app=$app --key=is_public
fi
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================