From 4a86e515fcb25f471dde5903423f49bbea04dc97 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Thu, 2 Jun 2016 22:39:01 +0200 Subject: [PATCH] =?UTF-8?q?HTTP=20auth=20priv=C3=A9=20seulement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/sql/common.sql | 1 - conf/sql/multisite.sql | 4 +++- conf/sql/single.sql | 4 +++- scripts/install | 16 ++++++++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/conf/sql/common.sql b/conf/sql/common.sql index 0bd6d76..682a0ea 100644 --- a/conf/sql/common.sql +++ b/conf/sql/common.sql @@ -1,3 +1,2 @@ INSERT INTO wp_options VALUES('','sll_settings','a:14:{s:14:"account_suffix";s:0:"";s:7:"base_dn";s:27:"ou=users,dc=yunohost,dc=org";s:18:"domain_controllers";a:1:{i:0;s:9:"localhost";}s:9:"directory";s:2:"ol";s:4:"role";s:10:"subscriber";s:13:"high_security";s:5:"false";s:8:"ol_login";s:3:"uid";s:7:"use_tls";s:5:"false";s:9:"ldap_port";s:3:"389";s:12:"ldap_version";s:1:"3";s:12:"create_users";s:4:"true";s:7:"enabled";s:4:"true";s:7:"version";s:3:"1.5";s:6:"groups";a:1:{i:0;s:0:"";}}','yes'); INSERT INTO wp_options (option_id,option_name,option_value,autoload) VALUES('','WPLANG','__LANGUAGE__','yes') ON DUPLICATE KEY UPDATE option_value=VALUES(option_value); -UPDATE wp_options SET option_value = '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;}' WHERE option_name = 'http_authentication_options' ; diff --git a/conf/sql/multisite.sql b/conf/sql/multisite.sql index 0b22009..dfbcba7 100644 --- a/conf/sql/multisite.sql +++ b/conf/sql/multisite.sql @@ -1 +1,3 @@ -UPDATE wp_sitemeta SET meta_value='a:2:{s:39:"simple-ldap-login/Simple-LDAP-Login.php";i:__DATE__;s:43:"http-authentication/http-authentication.php";i:__DATE__;}' WHERE meta_key='active_sitewide_plugins'; +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'); +#--PUBLIC--UPDATE wp_sitemeta SET meta_value='a:1:{s:39:"simple-ldap-login/Simple-LDAP-Login.php";i:__DATE__;}' WHERE meta_key='active_sitewide_plugins'; +#--PRIVATE--UPDATE wp_sitemeta SET meta_value='a:2:{s:39:"simple-ldap-login/Simple-LDAP-Login.php";i:__DATE__;s:43:"http-authentication/http-authentication.php";i:__DATE__;}' WHERE meta_key='active_sitewide_plugins'; diff --git a/conf/sql/single.sql b/conf/sql/single.sql index 4706c23..cfba297 100644 --- a/conf/sql/single.sql +++ b/conf/sql/single.sql @@ -1 +1,3 @@ -UPDATE wp_options SET option_value='a:2:{i:0;s:43:"http-authentication/http-authentication.php";i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins'; \ No newline at end of file +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:1;}','yes'); +#--PRIVATE--UPDATE wp_options SET option_value='a:2:{i:0;s:43:"http-authentication/http-authentication.php";i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins'; +#--PUBLIC--UPDATE wp_options SET option_value='a:1:{i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins'; diff --git a/scripts/install b/scripts/install index d66e0c5..ec4469c 100644 --- a/scripts/install +++ b/scripts/install @@ -192,6 +192,9 @@ sudo sed -i "s@__DOMAIN_PATH__@$domain$path@g" ../conf/sql/*.sql sudo sed -i "s/__LANGUAGE__/$language/g" ../conf/sql/*.sql sudo sed -i "s/__DATE__/$(date +%s)/g" ../conf/sql/*.sql +# Charge les commandes sql communes à tous les scripts. +mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql + if [ "$multisite" = "Yes" ] then # Installation de php5-cli pour wp-cli @@ -210,23 +213,28 @@ then sudo sed -i "s@//--MULTISITE2--define@define@g" $final_path/wp-config.php # Charge les commandes sql pour activer les plugins + if [ "$is_public" = "No" ]; + then + sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/multisite.sql + else + sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/multisite.sql + fi mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/multisite.sql else if [ "$is_public" = "No" ]; then sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf + sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/single.sql else sudo sed -i "s@//--PUBLIC--define@define@g" $final_path/wp-config.php sudo sed -i "s@#--PRIVATE--@#@g" /etc/nginx/conf.d/$domain.d/$app.conf + sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/single.sql fi # Charge les commandes sql pour activer les plugins mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/single.sql fi -# Charge les commandes sql communes à tous les scripts. -mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql - -# Décommente les add_filter, qui aurait provoqué une erreur avec wp-cli +# Décommente les add_filter, qui auraient provoqué une erreur avec wp-cli sudo sed -i "s@//add_filter@add_filter@g" $final_path/wp-config.php # Configure les droits d'accès au fichiers