Browse Source
Merge pull request #37 from YunoHost-Apps/fix_ldap_plugin
Fix ldap multisite
pull/35/head
Maniack Crudelis
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
3 deletions
-
scripts/install
-
scripts/upgrade
|
|
|
@ -200,17 +200,19 @@ then |
|
|
|
ynh_replace_string "//--MULTISITE2--define" "define" $final_path/wp-config.php |
|
|
|
|
|
|
|
ynh_mysql_connect_as $db_name $db_pwd $db_name < ../conf/sql/multisite.sql |
|
|
|
plugin_network="--network" |
|
|
|
else |
|
|
|
ynh_mysql_connect_as $db_name $db_pwd $db_name < ../conf/sql/single.sql |
|
|
|
plugin_network="" |
|
|
|
fi |
|
|
|
|
|
|
|
#================================================= |
|
|
|
# ACTIVATE WORDPRESS' PLUGINS |
|
|
|
#================================================= |
|
|
|
|
|
|
|
$wpcli_alias plugin activate simple-ldap-login |
|
|
|
$wpcli_alias plugin activate simple-ldap-login $plugin_network |
|
|
|
# Do not activate http-authentication, this plugin is sometimes unstable |
|
|
|
$wpcli_alias plugin activate companion-auto-update |
|
|
|
$wpcli_alias plugin activate companion-auto-update $plugin_network |
|
|
|
|
|
|
|
#================================================= |
|
|
|
# STORE THE CHECKSUM OF THE CONFIG FILE |
|
|
|
|
|
|
|
@ -129,8 +129,10 @@ ynh_backup_if_checksum_is_different "$final_path/wp-config.php" |
|
|
|
if [ $multisite -eq 1 ] |
|
|
|
then |
|
|
|
ynh_replace_string "#--MULTISITE--" "" /etc/nginx/conf.d/$domain.d/$app.conf |
|
|
|
plugin_network="--network" |
|
|
|
else |
|
|
|
multisite=0 |
|
|
|
plugin_network="" |
|
|
|
if [ $is_public -eq 0 ] |
|
|
|
then |
|
|
|
ynh_replace_string "#--PRIVATE--" "" /etc/nginx/conf.d/$domain.d/$app.conf |
|
|
|
@ -151,7 +153,7 @@ update_plugin () { |
|
|
|
} |
|
|
|
update_plugin simple-ldap-login |
|
|
|
update_plugin companion-auto-update |
|
|
|
$wpcli_alias plugin activate companion-auto-update |
|
|
|
$wpcli_alias plugin activate companion-auto-update $plugin_network |
|
|
|
|
|
|
|
# Disable broken plugin http-authentication |
|
|
|
$wpcli_alias plugin is-installed http-authentication && $wpcli_alias plugin deactivate http-authentication |
|
|
|
|
