mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
Fix
This commit is contained in:
parent
6eb29b1d71
commit
81e1eaeb97
3 changed files with 14 additions and 24 deletions
|
@ -8,6 +8,20 @@
|
||||||
# EXPERIMENTAL HELPERS
|
# EXPERIMENTAL HELPERS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
|
# Define a function to add an external storage
|
||||||
|
# Create the external storage for the given folders and enable sharing
|
||||||
|
create_external_storage() {
|
||||||
|
local datadir="$1"
|
||||||
|
local mount_name="$2"
|
||||||
|
local mount_id=$(exec_occ files_external:create --output=json \
|
||||||
|
"$mount_name" 'local' 'null::null' -c "datadir=$datadir/data" || true)
|
||||||
|
! [[ $mount_id =~ ^[0-9]+$ ]] \
|
||||||
|
&& ynh_print_warn --message="Unable to create external storage" \
|
||||||
|
|| exec_occ files_external:option "$mount_id" enable_sharing true
|
||||||
|
}
|
||||||
|
|
||||||
|
#=================================================
|
||||||
|
|
||||||
# Check if an URL is already handled
|
# Check if an URL is already handled
|
||||||
# usage: is_url_handled --domain=DOMAIN --path=PATH_URI
|
# usage: is_url_handled --domain=DOMAIN --path=PATH_URI
|
||||||
is_url_handled() {
|
is_url_handled() {
|
||||||
|
|
|
@ -143,18 +143,6 @@ exec_occ ldap:test-config '' \
|
||||||
# MOUNT HOME FOLDERS AS EXTERNAL STORAGE
|
# MOUNT HOME FOLDERS AS EXTERNAL STORAGE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
# Define a function to add an external storage
|
|
||||||
# Create the external storage for the given folders and enable sharing
|
|
||||||
create_external_storage() {
|
|
||||||
local data_dir="$1"
|
|
||||||
local mount_name="$2"
|
|
||||||
local mount_id=`exec_occ files_external:create --output=json \
|
|
||||||
"$mount_name" 'local' 'null::null' -c "data_dir=$data_dir/data" || true`
|
|
||||||
! [[ $mount_id =~ ^[0-9]+$ ]] \
|
|
||||||
&& ynh_print_warn --message="Unable to create external storage" \
|
|
||||||
|| exec_occ files_external:option "$mount_id" enable_sharing true
|
|
||||||
}
|
|
||||||
|
|
||||||
# Enable External Storage and create local mount to home folder
|
# Enable External Storage and create local mount to home folder
|
||||||
if [ $user_home -eq 1 ]
|
if [ $user_home -eq 1 ]
|
||||||
then
|
then
|
||||||
|
|
|
@ -112,18 +112,6 @@ exec_occ() {
|
||||||
php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
|
php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
|
||||||
}
|
}
|
||||||
|
|
||||||
# Define a function to add an external storage
|
|
||||||
# Create the external storage for the given folders and enable sharing
|
|
||||||
create_external_storage() {
|
|
||||||
local data_dir="$1"
|
|
||||||
local mount_name="$2"
|
|
||||||
local mount_id=$(exec_occ files_external:create --output=json \
|
|
||||||
"$mount_name" 'local' 'null::null' -c "data_dir=$data_dir/data" || true)
|
|
||||||
! [[ $mount_id =~ ^[0-9]+$ ]] \
|
|
||||||
&& ynh_print_warn --message="Unable to create external storage" \
|
|
||||||
|| exec_occ files_external:option "$mount_id" enable_sharing true
|
|
||||||
}
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# HANDLE DATABASE MIGRATION
|
# HANDLE DATABASE MIGRATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
Loading…
Add table
Reference in a new issue