Browse Source

Multisite fonctionnel

pull/1/head
Maniack Crudelis 11 years ago
parent
commit
0736014586
  1. 3
      .gitignore
  2. 16
      conf/nginx.conf
  3. 17
      conf/nginx.conf-public
  4. 4
      conf/private.sql
  5. 2
      conf/sql/common.sql
  6. 3
      conf/sql/multisite.sql
  7. 3
      conf/sql/single.sql
  8. 11
      conf/wp-config.php
  9. 16
      manifest.json
  10. 100
      scripts/install
  11. BIN
      sources/ajouts/wp-cli.phar
  12. 0
      sources/ajouts/wp-content/plugins/http-authentication/http-authentication.php
  13. 0
      sources/ajouts/wp-content/plugins/http-authentication/options-page.php
  14. 0
      sources/ajouts/wp-content/plugins/http-authentication/readme.txt
  15. 0
      sources/ajouts/wp-content/plugins/http-authentication/screenshot-1.png
  16. 0
      sources/ajouts/wp-content/plugins/http-authentication/screenshot-2.png
  17. 0
      sources/ajouts/wp-content/plugins/simple-ldap-login/Simple-LDAP-Login-Admin.php
  18. 0
      sources/ajouts/wp-content/plugins/simple-ldap-login/Simple-LDAP-Login.php
  19. 0
      sources/ajouts/wp-content/plugins/simple-ldap-login/includes/adLDAP.php
  20. 0
      sources/ajouts/wp-content/plugins/simple-ldap-login/readme.md
  21. 0
      sources/ajouts/wp-content/plugins/simple-ldap-login/readme.txt
  22. 0
      sources/wordpress/index.php
  23. 0
      sources/wordpress/license.txt
  24. 0
      sources/wordpress/readme.html
  25. 0
      sources/wordpress/wp-activate.php
  26. 8
      sources/wordpress/wp-admin/about.php
  27. 0
      sources/wordpress/wp-admin/admin-ajax.php
  28. 0
      sources/wordpress/wp-admin/admin-footer.php
  29. 0
      sources/wordpress/wp-admin/admin-functions.php
  30. 0
      sources/wordpress/wp-admin/admin-header.php
  31. 0
      sources/wordpress/wp-admin/admin-post.php
  32. 0
      sources/wordpress/wp-admin/admin.php
  33. 0
      sources/wordpress/wp-admin/async-upload.php
  34. 0
      sources/wordpress/wp-admin/comment.php
  35. 0
      sources/wordpress/wp-admin/credits.php
  36. 0
      sources/wordpress/wp-admin/css/about-rtl.css
  37. 0
      sources/wordpress/wp-admin/css/about.css
  38. 0
      sources/wordpress/wp-admin/css/admin-menu-rtl.css
  39. 0
      sources/wordpress/wp-admin/css/admin-menu.css
  40. 0
      sources/wordpress/wp-admin/css/color-picker-rtl.css
  41. 0
      sources/wordpress/wp-admin/css/color-picker-rtl.min.css
  42. 0
      sources/wordpress/wp-admin/css/color-picker.css
  43. 0
      sources/wordpress/wp-admin/css/color-picker.min.css
  44. 0
      sources/wordpress/wp-admin/css/colors/_admin.scss
  45. 0
      sources/wordpress/wp-admin/css/colors/_mixins.scss
  46. 0
      sources/wordpress/wp-admin/css/colors/_variables.scss
  47. 0
      sources/wordpress/wp-admin/css/colors/blue/colors-rtl.css
  48. 0
      sources/wordpress/wp-admin/css/colors/blue/colors-rtl.min.css
  49. 0
      sources/wordpress/wp-admin/css/colors/blue/colors.css
  50. 0
      sources/wordpress/wp-admin/css/colors/blue/colors.min.css
  51. 0
      sources/wordpress/wp-admin/css/colors/blue/colors.scss
  52. 0
      sources/wordpress/wp-admin/css/colors/coffee/colors-rtl.css
  53. 0
      sources/wordpress/wp-admin/css/colors/coffee/colors-rtl.min.css
  54. 0
      sources/wordpress/wp-admin/css/colors/coffee/colors.css
  55. 0
      sources/wordpress/wp-admin/css/colors/coffee/colors.min.css
  56. 0
      sources/wordpress/wp-admin/css/colors/coffee/colors.scss
  57. 0
      sources/wordpress/wp-admin/css/colors/ectoplasm/colors-rtl.css
  58. 0
      sources/wordpress/wp-admin/css/colors/ectoplasm/colors-rtl.min.css
  59. 0
      sources/wordpress/wp-admin/css/colors/ectoplasm/colors.css
  60. 0
      sources/wordpress/wp-admin/css/colors/ectoplasm/colors.min.css
  61. 0
      sources/wordpress/wp-admin/css/colors/ectoplasm/colors.scss
  62. 0
      sources/wordpress/wp-admin/css/colors/light/colors-rtl.css
  63. 0
      sources/wordpress/wp-admin/css/colors/light/colors-rtl.min.css
  64. 0
      sources/wordpress/wp-admin/css/colors/light/colors.css
  65. 0
      sources/wordpress/wp-admin/css/colors/light/colors.min.css
  66. 0
      sources/wordpress/wp-admin/css/colors/light/colors.scss
  67. 0
      sources/wordpress/wp-admin/css/colors/midnight/colors-rtl.css
  68. 0
      sources/wordpress/wp-admin/css/colors/midnight/colors-rtl.min.css
  69. 0
      sources/wordpress/wp-admin/css/colors/midnight/colors.css
  70. 0
      sources/wordpress/wp-admin/css/colors/midnight/colors.min.css
  71. 0
      sources/wordpress/wp-admin/css/colors/midnight/colors.scss
  72. 0
      sources/wordpress/wp-admin/css/colors/ocean/colors-rtl.css
  73. 0
      sources/wordpress/wp-admin/css/colors/ocean/colors-rtl.min.css
  74. 0
      sources/wordpress/wp-admin/css/colors/ocean/colors.css
  75. 0
      sources/wordpress/wp-admin/css/colors/ocean/colors.min.css
  76. 0
      sources/wordpress/wp-admin/css/colors/ocean/colors.scss
  77. 0
      sources/wordpress/wp-admin/css/colors/sunrise/colors-rtl.css
  78. 0
      sources/wordpress/wp-admin/css/colors/sunrise/colors-rtl.min.css
  79. 0
      sources/wordpress/wp-admin/css/colors/sunrise/colors.css
  80. 0
      sources/wordpress/wp-admin/css/colors/sunrise/colors.min.css
  81. 0
      sources/wordpress/wp-admin/css/colors/sunrise/colors.scss
  82. 0
      sources/wordpress/wp-admin/css/common-rtl.css
  83. 0
      sources/wordpress/wp-admin/css/common.css
  84. 0
      sources/wordpress/wp-admin/css/customize-controls-rtl.css
  85. 0
      sources/wordpress/wp-admin/css/customize-controls-rtl.min.css
  86. 0
      sources/wordpress/wp-admin/css/customize-controls.css
  87. 0
      sources/wordpress/wp-admin/css/customize-controls.min.css
  88. 0
      sources/wordpress/wp-admin/css/customize-widgets-rtl.css
  89. 0
      sources/wordpress/wp-admin/css/customize-widgets-rtl.min.css
  90. 0
      sources/wordpress/wp-admin/css/customize-widgets.css
  91. 0
      sources/wordpress/wp-admin/css/customize-widgets.min.css
  92. 0
      sources/wordpress/wp-admin/css/dashboard-rtl.css
  93. 0
      sources/wordpress/wp-admin/css/dashboard.css
  94. 0
      sources/wordpress/wp-admin/css/deprecated-media-rtl.css
  95. 0
      sources/wordpress/wp-admin/css/deprecated-media-rtl.min.css
  96. 0
      sources/wordpress/wp-admin/css/deprecated-media.css
  97. 0
      sources/wordpress/wp-admin/css/deprecated-media.min.css
  98. 0
      sources/wordpress/wp-admin/css/edit-rtl.css
  99. 0
      sources/wordpress/wp-admin/css/edit.css
  100. 0
      sources/wordpress/wp-admin/css/farbtastic-rtl.css

3
.gitignore

@ -0,0 +1,3 @@
*.swp
*~
Notes

16
conf/nginx.conf

@ -1,13 +1,19 @@
#--MULTISITE--if (!-e $request_filename) {
#--MULTISITE--rewrite /wp-admin$ $scheme://$host$uri/ permanent;
#--MULTISITE--rewrite ^PATHTOCHANGE(/[^/]+)?(/wp-.*) PATHTOCHANGE$2 last;
#--MULTISITE--rewrite ^PATHTOCHANGE(/[^/]+)?(/.*\.php)$ PATHTOCHANGE$2 last;
#--MULTISITE--}
location PATHTOCHANGE { location PATHTOCHANGE {
alias ALIASTOCHANGE; alias ALIASTOCHANGE;
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
index index.php; index index.php;
if (!-e $request_filename) if (!-e $request_filename)
{ {
rewrite ^(.+)$ PATHTOCHANGE/index.php?q=$1 last; rewrite ^(.+)$ PATHTOCHANGE/index.php?q=$1 last;
} }
#--PRIVATE--if ($scheme = http) {
#--PRIVATE-- rewrite ^ https://$server_name$request_uri? permanent;
#--PRIVATE--}
client_max_body_size 30m; client_max_body_size 30m;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
@ -18,6 +24,6 @@ location PATHTOCHANGE {
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
} }
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
#--PRIVATE--# Include SSOWAT user panel.
#--PRIVATE--include conf.d/yunohost_panel.conf.inc;
} }

17
conf/nginx.conf-public

@ -1,17 +0,0 @@
location PATHTOCHANGE {
alias ALIASTOCHANGE;
index index.php;
if (!-e $request_filename)
{
rewrite ^(.+)$ PATHTOCHANGE/index.php?q=$1 last;
}
client_max_body_size 30m;
location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user;
fastcgi_param PATH_INFO $fastcgi_path_info;
}
}

4
conf/private.sql

@ -1,4 +0,0 @@
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 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://URLWORDPRESS/wp-login.php";s:10:"logout_uri";s:28:"https://URLWORDPRESS/";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');
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';
INSERT INTO wp_options (option_id,option_name,option_value,autoload) VALUES('','WPLANG','I18NTOCHANGE','yes') ON DUPLICATE KEY UPDATE option_value=VALUES(option_value);

2
conf/public.sql → conf/sql/common.sql

@ -1,4 +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 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 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://URLWORDPRESS/wp-login.php";s:10:"logout_uri";s:28:"https://URLWORDPRESS/";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');
UPDATE wp_options SET option_value='a:1:{i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins';
INSERT INTO wp_options (option_id,option_name,option_value,autoload) VALUES('','WPLANG','I18NTOCHANGE','yes') ON DUPLICATE KEY UPDATE option_value=VALUES(option_value); INSERT INTO wp_options (option_id,option_name,option_value,autoload) VALUES('','WPLANG','I18NTOCHANGE','yes') ON DUPLICATE KEY UPDATE option_value=VALUES(option_value);

3
conf/sql/multisite.sql

@ -0,0 +1,3 @@
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://URLWORDPRESS/wp-login.php";s:10:"logout_uri";s:28:"https://URLWORDPRESS/";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';

3
conf/sql/single.sql

@ -0,0 +1,3 @@
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://URLWORDPRESS/wp-login.php";s:10:"logout_uri";s:28:"https://URLWORDPRESS/";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';

11
conf/wp-config.php

@ -24,6 +24,15 @@ $table_prefix = 'wp_';
// Debug mode // Debug mode
define('WP_DEBUG', false); define('WP_DEBUG', false);
// Multisite
//--MULTISITE1--define('WP_ALLOW_MULTISITE', true);
//--MULTISITE2--define('MULTISITE', true);
//--MULTISITE2--define('SUBDOMAIN_INSTALL', false);
//--MULTISITE2--define('DOMAIN_CURRENT_SITE', '__DOMAIN__');
//--MULTISITE2--define('PATH_CURRENT_SITE', '__PATH__/');
//--MULTISITE2--define('SITE_ID_CURRENT_SITE', 1);
//--MULTISITE2--define('BLOG_ID_CURRENT_SITE', 1);
// Path // Path
if ( !defined('ABSPATH') ) if ( !defined('ABSPATH') )
define('ABSPATH', dirname(__FILE__) . '/'); define('ABSPATH', dirname(__FILE__) . '/');
@ -32,4 +41,4 @@ if ( !defined('ABSPATH') )
require_once(ABSPATH . 'wp-settings.php'); require_once(ABSPATH . 'wp-settings.php');
// Force https redirect // Force https redirect
//define('FORCE_SSL_ADMIN', true);
//--PUBLIC--define('FORCE_SSL_ADMIN', true);

16
manifest.json

@ -1,6 +1,6 @@
{ {
"name": "WordPress",
"id": "wordpress",
"name": "WordPress MultiSite",
"id": "wordpressms",
"description": { "description": {
"en": "Create a beautiful blog or website easily", "en": "Create a beautiful blog or website easily",
"fr": "Logiciel de création de blog ou de site Web" "fr": "Logiciel de création de blog ou de site Web"
@ -48,14 +48,22 @@
"choices": ["en_EN", "fr_FR"], "choices": ["en_EN", "fr_FR"],
"default": "en_EN" "default": "en_EN"
}, },
{
"name": "multisite",
"ask": {
"en": "Enable multisite option ?",
"fr": "Activer l'option multisite ?"
},
"choices": ["Yes", "No"],
"default": "No"
},
{ {
"name": "public_site", "name": "public_site",
"ask": { "ask": {
"en": "Is it a public WordPress site?",
"en": "Is it a public WordPress site ?",
"fr": "Est-ce un site public ?" "fr": "Est-ce un site public ?"
}, },
"choices": ["Yes", "No"], "choices": ["Yes", "No"],
"default": "Yes"
} }

100
scripts/install

@ -5,7 +5,8 @@ domain=$1
path=$2 path=$2
admin_wordpress=$3 admin_wordpress=$3
language=$4 language=$4
is_public=$5
multisite=$5
is_public=$6
# Check if admin exists # Check if admin exists
sudo yunohost user list --json | grep -q "\"username\": \"$admin_wordpress\"" sudo yunohost user list --json | grep -q "\"username\": \"$admin_wordpress\""
@ -13,12 +14,14 @@ if [[ ! $? -eq 0 ]]; then
echo "Wrong admin" echo "Wrong admin"
exit 1 exit 1
fi fi
sudo yunohost app setting wordpress admin -v $admin_wordpress
sudo yunohost app setting wordpress language -v $language
sudo yunohost app setting wordpress is_public -v $is_public
# Add settings to YunoHost
sudo yunohost app setting wordpressms admin -v $admin_wordpress
sudo yunohost app setting wordpressms language -v $language
sudo yunohost app setting wordpressms is_public -v $is_public
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl $domain$path -a wordpress
sudo yunohost app checkurl $domain$path -a wordpressms
if [[ ! $? -eq 0 ]]; then if [[ ! $? -eq 0 ]]; then
exit 1 exit 1
fi fi
@ -26,23 +29,29 @@ fi
# Generate random password # Generate random password
db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
# Use 'wordpress' as database name and user
db_user=wordpress
# Use 'wordpressms' as database name and user
db_user=wordpressms
# Initialize database and store mysql password for upgrade # Initialize database and store mysql password for upgrade
sudo yunohost app initdb $db_user -p $db_pwd sudo yunohost app initdb $db_user -p $db_pwd
sudo yunohost app setting wordpress mysqlpwd -v $db_pwd
sudo yunohost app setting wordpressms mysqlpwd -v $db_pwd
# Copy files to the right place # Copy files to the right place
final_path=/var/www/wordpress
final_path=/var/www/wordpressms
sudo mkdir -p $final_path sudo mkdir -p $final_path
sudo cp -a ../sources/* $final_path
sudo cp -a ../sources/wordpress/* $final_path
sudo cp -a ../sources/ajouts/* $final_path
sudo cp ../conf/wp-config.php $final_path/wp-config.php sudo cp ../conf/wp-config.php $final_path/wp-config.php
# Change variables in Wordpress configuration # Change variables in Wordpress configuration
sudo sed -i "s/yunouser/$db_user/g" $final_path/wp-config.php sudo sed -i "s/yunouser/$db_user/g" $final_path/wp-config.php
sudo sed -i "s/yunopass/$db_pwd/g" $final_path/wp-config.php sudo sed -i "s/yunopass/$db_pwd/g" $final_path/wp-config.php
sudo sed -i "s/yunobase/$db_user/g" $final_path/wp-config.php sudo sed -i "s/yunobase/$db_user/g" $final_path/wp-config.php
sudo sed -i "s/__DOMAIN__/$domain/g" $final_path/wp-config.php
sudo sed -i "s@__PATH__@$path@g" $final_path/wp-config.php
for i in 1 2 3 4 5 6 7 8 for i in 1 2 3 4 5 6 7 8
do do
j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p') j=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{40\}\).*/\1/p')
@ -55,20 +64,18 @@ do
sudo sed -i "s/KEY$i/$j/g" $final_path/wp-config.php sudo sed -i "s/KEY$i/$j/g" $final_path/wp-config.php
done done
sudo sed -i "s@URLWORDPRESS@$domain$path@g" ../conf/*.sql
sudo sed -i "s/I18NTOCHANGE/$language/g" ../conf/*.sql
# Set permissions to wordpress directory # Set permissions to wordpress directory
sudo chown -R www-data: $final_path sudo chown -R www-data: $final_path
# Modify Nginx configuration file and copy it to Nginx conf directory # Modify Nginx configuration file and copy it to Nginx conf directory
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf*
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf*
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/wordpress.conf
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/wordpressms.conf
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo service nginx reload sudo service nginx reload
sudo yunohost app setting wordpress skipped_uris -v "/"
# Donne un accès public pour curl
sudo yunohost app setting wordpressms skipped_uris -v "/"
sudo yunohost app ssowatconf sudo yunohost app ssowatconf
# Wordpress installation # Wordpress installation
@ -85,14 +92,59 @@ do
let loop_number++ let loop_number++
done done
# Replace variables in sql scripts
sudo sed -i "s@URLWORDPRESS@$domain$path@g" ../conf/sql/*.sql
sudo sed -i "s/I18NTOCHANGE/$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 -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql
if [ "$multisite" = "Yes" ];
then
# Installation de php5-cli pour wp-cli
sudo apt-get install php5-cli -qy
sudo sed -i "s@#--MULTISITE--@@g" /etc/nginx/conf.d/$domain.d/wordpressms.conf
# Autorise le multisite wordpress
sudo sed -i "s@//--MULTISITE1--define@define@g" $final_path/wp-config.php
# Active le multisite via wp-cli.
php $final_path/wp-cli.phar core multisite-convert --path=$final_path --base=$path/
echo "The 2 warnings of php about \"Permission denied\" on wp-config.php are normal. The install script writing into this file, not wp-cli!"
# Active le multisite wordpress
sudo sed -i "s@//--MULTISITE2--define@define@g" $final_path/wp-config.php
# Charge les commandes sql pour 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 -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/wordpressms.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/wordpressms.conf
sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/single.sql
fi
# Charge les commandes sql pour les plugins
mysql -u $db_user -p$db_pwd $db_user < ../conf/sql/single.sql
fi
if [ "$is_public" = "No" ]; if [ "$is_public" = "No" ];
then then
sudo yunohost app setting wordpress skipped_uris -d
# Retire l'accès public
sudo yunohost app setting wordpressms skipped_uris -d
sudo yunohost app ssowatconf sudo yunohost app ssowatconf
mysql -u $db_user -p$db_pwd $db_user < ../conf/private.sql
else
mysql -u $db_user -p$db_pwd $db_user < ../conf/public.sql
sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/wordpress.conf
sudo service nginx reload
sudo sed -i "s@//define('FORCE_SSL_ADMIN@define('FORCE_SSL_ADMIN@g" $final_path/wp-config.php
fi fi
sudo service nginx reload
# wp-cli me semble un peu trop permissif... Il a terminer son travail...
sudo rm $final_path/wp-cli.phar

BIN
sources/ajouts/wp-cli.phar

0
sources/wp-content/plugins/http-authentication/http-authentication.php → sources/ajouts/wp-content/plugins/http-authentication/http-authentication.php

0
sources/wp-content/plugins/http-authentication/options-page.php → sources/ajouts/wp-content/plugins/http-authentication/options-page.php

0
sources/wp-content/plugins/http-authentication/readme.txt → sources/ajouts/wp-content/plugins/http-authentication/readme.txt

0
sources/wp-content/plugins/http-authentication/screenshot-1.png → sources/ajouts/wp-content/plugins/http-authentication/screenshot-1.png

Before

Width: 1207  |  Height: 964  |  Size: 196 KiB

After

Width: 1207  |  Height: 964  |  Size: 196 KiB

0
sources/wp-content/plugins/http-authentication/screenshot-2.png → sources/ajouts/wp-content/plugins/http-authentication/screenshot-2.png

Before

Width: 1207  |  Height: 894  |  Size: 70 KiB

After

Width: 1207  |  Height: 894  |  Size: 70 KiB

0
sources/wp-content/plugins/simple-ldap-login/Simple-LDAP-Login-Admin.php → sources/ajouts/wp-content/plugins/simple-ldap-login/Simple-LDAP-Login-Admin.php

0
sources/wp-content/plugins/simple-ldap-login/Simple-LDAP-Login.php → sources/ajouts/wp-content/plugins/simple-ldap-login/Simple-LDAP-Login.php

0
sources/wp-content/plugins/simple-ldap-login/includes/adLDAP.php → sources/ajouts/wp-content/plugins/simple-ldap-login/includes/adLDAP.php

0
sources/wp-content/plugins/simple-ldap-login/readme.md → sources/ajouts/wp-content/plugins/simple-ldap-login/readme.md

0
sources/wp-content/plugins/simple-ldap-login/readme.txt → sources/ajouts/wp-content/plugins/simple-ldap-login/readme.txt

0
sources/index.php → sources/wordpress/index.php

0
sources/license.txt → sources/wordpress/license.txt

0
sources/readme.html → sources/wordpress/readme.html

0
sources/wp-activate.php → sources/wordpress/wp-activate.php

8
sources/wp-admin/about.php → sources/wordpress/wp-admin/about.php

@ -41,6 +41,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
</a> </a>
</h2> </h2>
<div class="changelog point-releases">
<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 1 ); ?></h3>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 23 ), '4.0.1', number_format_i18n( 23 ) ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.0.1' ); ?>
</p>
</div>
<div class="changelog"> <div class="changelog">
<div class="about-overview"> <div class="about-overview">
<?php if ( ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?> <?php if ( ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>

0
sources/wp-admin/admin-ajax.php → sources/wordpress/wp-admin/admin-ajax.php

0
sources/wp-admin/admin-footer.php → sources/wordpress/wp-admin/admin-footer.php

0
sources/wp-admin/admin-functions.php → sources/wordpress/wp-admin/admin-functions.php

0
sources/wp-admin/admin-header.php → sources/wordpress/wp-admin/admin-header.php

0
sources/wp-admin/admin-post.php → sources/wordpress/wp-admin/admin-post.php

0
sources/wp-admin/admin.php → sources/wordpress/wp-admin/admin.php

0
sources/wp-admin/async-upload.php → sources/wordpress/wp-admin/async-upload.php

0
sources/wp-admin/comment.php → sources/wordpress/wp-admin/comment.php

0
sources/wp-admin/credits.php → sources/wordpress/wp-admin/credits.php

0
sources/wp-admin/css/about-rtl.css → sources/wordpress/wp-admin/css/about-rtl.css

0
sources/wp-admin/css/about.css → sources/wordpress/wp-admin/css/about.css

0
sources/wp-admin/css/admin-menu-rtl.css → sources/wordpress/wp-admin/css/admin-menu-rtl.css

0
sources/wp-admin/css/admin-menu.css → sources/wordpress/wp-admin/css/admin-menu.css

0
sources/wp-admin/css/color-picker-rtl.css → sources/wordpress/wp-admin/css/color-picker-rtl.css

0
sources/wp-admin/css/color-picker-rtl.min.css → sources/wordpress/wp-admin/css/color-picker-rtl.min.css

0
sources/wp-admin/css/color-picker.css → sources/wordpress/wp-admin/css/color-picker.css

0
sources/wp-admin/css/color-picker.min.css → sources/wordpress/wp-admin/css/color-picker.min.css

0
sources/wp-admin/css/colors/_admin.scss → sources/wordpress/wp-admin/css/colors/_admin.scss

0
sources/wp-admin/css/colors/_mixins.scss → sources/wordpress/wp-admin/css/colors/_mixins.scss

0
sources/wp-admin/css/colors/_variables.scss → sources/wordpress/wp-admin/css/colors/_variables.scss

0
sources/wp-admin/css/colors/blue/colors-rtl.css → sources/wordpress/wp-admin/css/colors/blue/colors-rtl.css

0
sources/wp-admin/css/colors/blue/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/blue/colors-rtl.min.css

0
sources/wp-admin/css/colors/blue/colors.css → sources/wordpress/wp-admin/css/colors/blue/colors.css

0
sources/wp-admin/css/colors/blue/colors.min.css → sources/wordpress/wp-admin/css/colors/blue/colors.min.css

0
sources/wp-admin/css/colors/blue/colors.scss → sources/wordpress/wp-admin/css/colors/blue/colors.scss

0
sources/wp-admin/css/colors/coffee/colors-rtl.css → sources/wordpress/wp-admin/css/colors/coffee/colors-rtl.css

0
sources/wp-admin/css/colors/coffee/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/coffee/colors-rtl.min.css

0
sources/wp-admin/css/colors/coffee/colors.css → sources/wordpress/wp-admin/css/colors/coffee/colors.css

0
sources/wp-admin/css/colors/coffee/colors.min.css → sources/wordpress/wp-admin/css/colors/coffee/colors.min.css

0
sources/wp-admin/css/colors/coffee/colors.scss → sources/wordpress/wp-admin/css/colors/coffee/colors.scss

0
sources/wp-admin/css/colors/ectoplasm/colors-rtl.css → sources/wordpress/wp-admin/css/colors/ectoplasm/colors-rtl.css

0
sources/wp-admin/css/colors/ectoplasm/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/ectoplasm/colors-rtl.min.css

0
sources/wp-admin/css/colors/ectoplasm/colors.css → sources/wordpress/wp-admin/css/colors/ectoplasm/colors.css

0
sources/wp-admin/css/colors/ectoplasm/colors.min.css → sources/wordpress/wp-admin/css/colors/ectoplasm/colors.min.css

0
sources/wp-admin/css/colors/ectoplasm/colors.scss → sources/wordpress/wp-admin/css/colors/ectoplasm/colors.scss

0
sources/wp-admin/css/colors/light/colors-rtl.css → sources/wordpress/wp-admin/css/colors/light/colors-rtl.css

0
sources/wp-admin/css/colors/light/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/light/colors-rtl.min.css

0
sources/wp-admin/css/colors/light/colors.css → sources/wordpress/wp-admin/css/colors/light/colors.css

0
sources/wp-admin/css/colors/light/colors.min.css → sources/wordpress/wp-admin/css/colors/light/colors.min.css

0
sources/wp-admin/css/colors/light/colors.scss → sources/wordpress/wp-admin/css/colors/light/colors.scss

0
sources/wp-admin/css/colors/midnight/colors-rtl.css → sources/wordpress/wp-admin/css/colors/midnight/colors-rtl.css

0
sources/wp-admin/css/colors/midnight/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/midnight/colors-rtl.min.css

0
sources/wp-admin/css/colors/midnight/colors.css → sources/wordpress/wp-admin/css/colors/midnight/colors.css

0
sources/wp-admin/css/colors/midnight/colors.min.css → sources/wordpress/wp-admin/css/colors/midnight/colors.min.css

0
sources/wp-admin/css/colors/midnight/colors.scss → sources/wordpress/wp-admin/css/colors/midnight/colors.scss

0
sources/wp-admin/css/colors/ocean/colors-rtl.css → sources/wordpress/wp-admin/css/colors/ocean/colors-rtl.css

0
sources/wp-admin/css/colors/ocean/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/ocean/colors-rtl.min.css

0
sources/wp-admin/css/colors/ocean/colors.css → sources/wordpress/wp-admin/css/colors/ocean/colors.css

0
sources/wp-admin/css/colors/ocean/colors.min.css → sources/wordpress/wp-admin/css/colors/ocean/colors.min.css

0
sources/wp-admin/css/colors/ocean/colors.scss → sources/wordpress/wp-admin/css/colors/ocean/colors.scss

0
sources/wp-admin/css/colors/sunrise/colors-rtl.css → sources/wordpress/wp-admin/css/colors/sunrise/colors-rtl.css

0
sources/wp-admin/css/colors/sunrise/colors-rtl.min.css → sources/wordpress/wp-admin/css/colors/sunrise/colors-rtl.min.css

0
sources/wp-admin/css/colors/sunrise/colors.css → sources/wordpress/wp-admin/css/colors/sunrise/colors.css

0
sources/wp-admin/css/colors/sunrise/colors.min.css → sources/wordpress/wp-admin/css/colors/sunrise/colors.min.css

0
sources/wp-admin/css/colors/sunrise/colors.scss → sources/wordpress/wp-admin/css/colors/sunrise/colors.scss

0
sources/wp-admin/css/common-rtl.css → sources/wordpress/wp-admin/css/common-rtl.css

0
sources/wp-admin/css/common.css → sources/wordpress/wp-admin/css/common.css

0
sources/wp-admin/css/customize-controls-rtl.css → sources/wordpress/wp-admin/css/customize-controls-rtl.css

0
sources/wp-admin/css/customize-controls-rtl.min.css → sources/wordpress/wp-admin/css/customize-controls-rtl.min.css

0
sources/wp-admin/css/customize-controls.css → sources/wordpress/wp-admin/css/customize-controls.css

0
sources/wp-admin/css/customize-controls.min.css → sources/wordpress/wp-admin/css/customize-controls.min.css

0
sources/wp-admin/css/customize-widgets-rtl.css → sources/wordpress/wp-admin/css/customize-widgets-rtl.css

0
sources/wp-admin/css/customize-widgets-rtl.min.css → sources/wordpress/wp-admin/css/customize-widgets-rtl.min.css

0
sources/wp-admin/css/customize-widgets.css → sources/wordpress/wp-admin/css/customize-widgets.css

0
sources/wp-admin/css/customize-widgets.min.css → sources/wordpress/wp-admin/css/customize-widgets.min.css

0
sources/wp-admin/css/dashboard-rtl.css → sources/wordpress/wp-admin/css/dashboard-rtl.css

0
sources/wp-admin/css/dashboard.css → sources/wordpress/wp-admin/css/dashboard.css

0
sources/wp-admin/css/deprecated-media-rtl.css → sources/wordpress/wp-admin/css/deprecated-media-rtl.css

0
sources/wp-admin/css/deprecated-media-rtl.min.css → sources/wordpress/wp-admin/css/deprecated-media-rtl.min.css

0
sources/wp-admin/css/deprecated-media.css → sources/wordpress/wp-admin/css/deprecated-media.css

0
sources/wp-admin/css/deprecated-media.min.css → sources/wordpress/wp-admin/css/deprecated-media.min.css

0
sources/wp-admin/css/edit-rtl.css → sources/wordpress/wp-admin/css/edit-rtl.css

0
sources/wp-admin/css/edit.css → sources/wordpress/wp-admin/css/edit.css

0
sources/wp-admin/css/farbtastic-rtl.css → sources/wordpress/wp-admin/css/farbtastic-rtl.css

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save