YunoHost-Apps/roundcube_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/roundcube_ynh.git synced 2024-09-03 20:16:28 +02:00
Code Issues Activity Actions

Fix

Browse source
This commit is contained in:
ericgaspar 2021-08-27 10:17:09 +02:00
parent 8d37422198
commit fe55c998a5
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/enigma.config.inc.php
View file

@ -14,7 +14,7 @@ $config['enigma_debug'] = false;
// REQUIRED! Keys directory for all users. // REQUIRED! Keys directory for all users.
// Must be writeable by PHP process, and not in the web server document root // Must be writeable by PHP process, and not in the web server document root
$config['enigma_pgp_homedir'] = '__DIR__'; $config['enigma_pgp_homedir'] = '__FINALPATH__/plugins/enigma/home';
// Location of gpg binary. By default it will be auto-detected. // Location of gpg binary. By default it will be auto-detected.
// This is also a way to force gpg2 use if there are both 1.x and 2.x on the system. // This is also a way to force gpg2 use if there are both 1.x and 2.x on the system.

17
scripts/install
View file

@ -184,7 +184,7 @@ then
done done
done done
# Do not actualy add the cardDAV plugin if there's no carddav server available... # Do not actualy add the cardDAV plugin if there's no cardDAV server available...
if [ $carddav_server -eq 1 ] if [ $carddav_server -eq 1 ]
then then
installed_plugins+=" 'carddav'," installed_plugins+=" 'carddav',"
@ -194,13 +194,11 @@ fi
# Install Enigma plugin # Install Enigma plugin
if [ $with_enigma -eq 1 ] if [ $with_enigma -eq 1 ]
then then
enigma_tmp_config="../conf/enigma.config.inc.php" ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php"
installed_plugins+=" 'enigma'," || ynh_print_warn --message="Unable to install Enigma plugin"
ynh_replace_string --match_string="__DIR__" --replace_string="$final_path/plugins/enigma/home" --target_file="$enigma_tmp_config" mkdir -p "$final_path/plugins/enigma/home"
chown -R $app:$app "$final_path/plugins/enigma/home"
cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \
&& installed_plugins+=" 'enigma'," \
|| ynh_print_warn --message="Unable to install Enigma plugin"
fi fi
#================================================= #=================================================
@ -226,9 +224,14 @@ chown $app:$app "$final_path/config/config.inc.php"
# SECURE FILES AND DIRECTORIES # SECURE FILES AND DIRECTORIES
#================================================= #=================================================
<<<<<<< Updated upstream
mkdir -p "$final_path/plugins/enigma/home" mkdir -p "$final_path/plugins/enigma/home"
#chown -R $app:$app "$final_path/plugins/enigma/home" #chown -R $app:$app "$final_path/plugins/enigma/home"
chown -R $app:www-data "$final_path/plugins" chown -R $app:www-data "$final_path/plugins"
=======
#mkdir -p "$final_path/plugins/enigma/home"
#chown -R $app:$app "$final_path/plugins/enigma/home"
>>>>>>> Stashed changes
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX