From 052a607ce3225006388395ad3795b5fe506756a4 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Fri, 20 Oct 2017 14:34:08 +0200
Subject: [PATCH 1/2] Remove broken http auth

---
 conf/sql/common.sql | 1 -
 scripts/install     | 5 -----
 scripts/upgrade     | 4 +++-
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 conf/sql/common.sql

diff --git a/conf/sql/common.sql b/conf/sql/common.sql
deleted file mode 100644
index c56f29f..0000000
--- a/conf/sql/common.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO wp_options VALUES('','http_authentication_options','a:8:{s:13:"allow_wp_auth";b:1;s:10:"auth_label";s:19:"HTTP authentication";s:9:"login_uri";s:40:"https://__DOMAIN_PATH__/wp-login.php";s:10:"logout_uri";s:28:"https://__DOMAIN_PATH__/";s:22:"additional_server_keys";s:13:"PHP_AUTH_USER";s:24:"auto_create_email_domain";s:0:"";s:10:"db_version";i:2;s:16:"auto_create_user";b:0;}','yes');
diff --git a/scripts/install b/scripts/install
index 97a2802..e756737 100644
--- a/scripts/install
+++ b/scripts/install
@@ -165,7 +165,6 @@ wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.ph
 wpcli_alias="php $final_path/wp-cli.phar --allow-root --path=$final_path"
 
 $wpcli_alias plugin install simple-ldap-login
-$wpcli_alias plugin install http-authentication
 $wpcli_alias plugin install companion-auto-update
 
 #=================================================
@@ -176,9 +175,6 @@ $wpcli_alias plugin install companion-auto-update
 ynh_replace_string "__DOMAIN_PATH__" "$domain$path_url" ../conf/sql/*.sql
 ynh_replace_string "__DATE__" "$(date +%s)" ../conf/sql/*.sql
 
-# Charge les commandes sql communes à tous les scripts.
-ynh_mysql_connect_as $db_name $db_pwd $db_name < ../conf/sql/common.sql
-
 #=================================================
 # SET LANGUAGE
 #=================================================
@@ -212,7 +208,6 @@ fi
 #=================================================
 
 $wpcli_alias plugin activate simple-ldap-login
-$wpcli_alias plugin activate http-authentication
 $wpcli_alias plugin activate companion-auto-update
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 4af99ef..d497768 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -150,10 +150,12 @@ update_plugin () {
 	( $wpcli_alias plugin is-installed $1 && $wpcli_alias plugin update $1 ) || $wpcli_alias plugin install $1
 }
 update_plugin simple-ldap-login
-update_plugin http-authentication
 update_plugin companion-auto-update
 $wpcli_alias plugin activate companion-auto-update
 
+# Remove broken plugin http-authentication
+$wpcli_alias plugin is-installed http-authentication && $wpcli_alias plugin delete http-authentication
+
 #=================================================
 # STORE THE CHECKSUM OF THE CONFIG FILE
 #=================================================

From f1af19c65cdbb507397480f29cb35143d497995c Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Fri, 20 Oct 2017 15:27:47 +0200
Subject: [PATCH 2/2] Disable but not remove

---
 scripts/install | 2 ++
 scripts/upgrade | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index e756737..48e6ff6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -165,6 +165,7 @@ wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.ph
 wpcli_alias="php $final_path/wp-cli.phar --allow-root --path=$final_path"
 
 $wpcli_alias plugin install simple-ldap-login
+$wpcli_alias plugin install http-authentication
 $wpcli_alias plugin install companion-auto-update
 
 #=================================================
@@ -208,6 +209,7 @@ fi
 #=================================================
 
 $wpcli_alias plugin activate simple-ldap-login
+# Do not activate http-authentication, this plugin is sometimes unstable
 $wpcli_alias plugin activate companion-auto-update
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index d497768..41784f5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -153,8 +153,8 @@ update_plugin simple-ldap-login
 update_plugin companion-auto-update
 $wpcli_alias plugin activate companion-auto-update
 
-# Remove broken plugin http-authentication
-$wpcli_alias plugin is-installed http-authentication && $wpcli_alias plugin delete http-authentication
+# Disable broken plugin http-authentication
+$wpcli_alias plugin is-installed http-authentication && $wpcli_alias plugin deactivate http-authentication
 
 #=================================================
 # STORE THE CHECKSUM OF THE CONFIG FILE