smeserver-wordpress/contribs8/smeserver-wordpress-1.0_corrected_ownership2www_and_added_salt.patch

diff -Nur smeserver-wordpress-1.0.old/createlinks smeserver-wordpress-1.0/createlinks
--- smeserver-wordpress-1.0.old/createlinks     2014-09-02 22:45:55.776797222 +0200
+++ smeserver-wordpress-1.0/createlinks 2014-09-02 22:46:48.180457346 +0200
@@ -6,8 +6,8 @@
 # links to add
 
 # templates to expand
-       templates2events( "/etc/wordpress/wp-config.php" , qw( conf-wordpress bootstrap-console-save post-upgrade) );
-        templates2events( "/etc/e-smith/sql/init/80wordpress" , qw( conf-wordpress bootstrap-console-save post-upgrade) );
+       templates2events( "/etc/wordpress/wp-config.php" , qw( conf-wordpress bootstrap-console-save post-upgrade console-save) );
+        templates2events( "/etc/e-smith/sql/init/80wordpress" , qw( conf-wordpress bootstrap-console-save post-upgrade console-save) );
        templates2events( "/etc/httpd/conf/httpd.conf", "conf-wordpress" );
 
 # services to launch on event
@@ -16,4 +16,6 @@
 
 # actions to perform
        safe_symlink("../actions/wordpress", "root/etc/e-smith/events/conf-wordpress/20wordpress");
-       safe_symlink("../actions/wordpress", "root/etc/e-smith/events/bootstrap-console-save/20wordpress");
\ Pas de fin de ligne à la fin du fichier.
+       safe_symlink("../actions/wordpress", "root/etc/e-smith/events/bootstrap-console-save/20wordpress");
+        safe_symlink("../actions/wordpress", "root/etc/e-smith/events/console-save/20wordpress");
+
diff -Nur smeserver-wordpress-1.0.old/root/etc/e-smith/events/actions/wordpress smeserver-wordpress-1.0/root/etc/e-smith/events/actions/wordpress
--- smeserver-wordpress-1.0.old/root/etc/e-smith/events/actions/wordpress       2014-09-02 22:45:55.773796826 +0200
+++ smeserver-wordpress-1.0/root/etc/e-smith/events/actions/wordpress   2014-09-02 22:47:03.892454665 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
 
 system('chown www:root -R /usr/share/wordpress');
+system('chown www:root /etc/wordpress');
 
diff -Nur smeserver-wordpress-1.0.old/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist smeserver-wordpress-1.0/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist
--- smeserver-wordpress-1.0.old/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist       2014-09-02 22:45:55.775797090 +0200
+++ smeserver-wordpress-1.0/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist   2014-09-02 22:47:03.918457975 +0200
@@ -8,8 +8,8 @@
  * @since 2.6.0
  */
 {
-my $pw=$wordpress{'phrase'} ||"";
-       if ( $pw ne "" )
+my $pw=$wordpress{'Salt'} || "disabled";
+       if ( $pw eq "enabled" )
                {
                 if ( open( RANDOM, "/dev/urandom" ) )
                 {
@@ -22,7 +22,8 @@
                         }
                         else
                         {
-                                $pw = encode_base64($buf);
+                            use MIME::Base64 qw(encode_base64);
+                            $pw = encode_base64($buf);
                             chomp $pw;
                         }
                         close RANDOM;
diff -Nur smeserver-wordpress-1.0.old/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php smeserver-wordpress-1.0/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php
--- smeserver-wordpress-1.0.old/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php 2014-09-02 22:45:55.776797222 +0200
+++ smeserver-wordpress-1.0/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php     2014-09-02 22:47:03.920458231 +0200
@@ -1,3 +1,3 @@
 UID="root"
-GID="root"
-PERMS=0644
+GID="www"
+PERMS=0640
1	diff -Nur smeserver-wordpress-1.0.old/createlinks smeserver-wordpress-1.0/createlinks
2	--- smeserver-wordpress-1.0.old/createlinks 2014-09-02 22:45:55.776797222 +0200
3	+++ smeserver-wordpress-1.0/createlinks 2014-09-02 22:46:48.180457346 +0200
4	@@ -6,8 +6,8 @@
5	# links to add
6
7	# templates to expand
8	- templates2events( "/etc/wordpress/wp-config.php" , qw( conf-wordpress bootstrap-console-save post-upgrade) );
9	- templates2events( "/etc/e-smith/sql/init/80wordpress" , qw( conf-wordpress bootstrap-console-save post-upgrade) );
10	+ templates2events( "/etc/wordpress/wp-config.php" , qw( conf-wordpress bootstrap-console-save post-upgrade console-save) );
11	+ templates2events( "/etc/e-smith/sql/init/80wordpress" , qw( conf-wordpress bootstrap-console-save post-upgrade console-save) );
12	templates2events( "/etc/httpd/conf/httpd.conf", "conf-wordpress" );
13
14	# services to launch on event
15	@@ -16,4 +16,6 @@
16
17	# actions to perform
18	safe_symlink("../actions/wordpress", "root/etc/e-smith/events/conf-wordpress/20wordpress");
19	- safe_symlink("../actions/wordpress", "root/etc/e-smith/events/bootstrap-console-save/20wordpress");
20	\ Pas de fin de ligne à la fin du fichier.
21	+ safe_symlink("../actions/wordpress", "root/etc/e-smith/events/bootstrap-console-save/20wordpress");
22	+ safe_symlink("../actions/wordpress", "root/etc/e-smith/events/console-save/20wordpress");
23	+
24	diff -Nur smeserver-wordpress-1.0.old/root/etc/e-smith/events/actions/wordpress smeserver-wordpress-1.0/root/etc/e-smith/events/actions/wordpress
25	--- smeserver-wordpress-1.0.old/root/etc/e-smith/events/actions/wordpress 2014-09-02 22:45:55.773796826 +0200
26	+++ smeserver-wordpress-1.0/root/etc/e-smith/events/actions/wordpress 2014-09-02 22:47:03.892454665 +0200
27	@@ -1,4 +1,5 @@
28	#!/usr/bin/perl
29
30	system('chown www:root -R /usr/share/wordpress');
31	+system('chown www:root /etc/wordpress');
32
33	diff -Nur smeserver-wordpress-1.0.old/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist smeserver-wordpress-1.0/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist
34	--- smeserver-wordpress-1.0.old/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist 2014-09-02 22:45:55.775797090 +0200
35	+++ smeserver-wordpress-1.0/root/etc/e-smith/templates/etc/wordpress/wp-config.php/20inc_dist 2014-09-02 22:47:03.918457975 +0200
36	@@ -8,8 +8,8 @@
37	* @since 2.6.0
38	*/
39	{
40	-my $pw=$wordpress{'phrase'} \|\|"";
41	- if ( $pw ne "" )
42	+my $pw=$wordpress{'Salt'} \|\| "disabled";
43	+ if ( $pw eq "enabled" )
44	{
45	if ( open( RANDOM, "/dev/urandom" ) )
46	{
47	@@ -22,7 +22,8 @@
48	}
49	else
50	{
51	- $pw = encode_base64($buf);
52	+ use MIME::Base64 qw(encode_base64);
53	+ $pw = encode_base64($buf);
54	chomp $pw;
55	}
56	close RANDOM;
57	diff -Nur smeserver-wordpress-1.0.old/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php smeserver-wordpress-1.0/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php
58	--- smeserver-wordpress-1.0.old/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php 2014-09-02 22:45:55.776797222 +0200
59	+++ smeserver-wordpress-1.0/root/etc/e-smith/templates.metadata/etc/wordpress/wp-config.php 2014-09-02 22:47:03.920458231 +0200
60	@@ -1,3 +1,3 @@
61	UID="root"
62	-GID="root"
63	-PERMS=0644
64	+GID="www"
65	+PERMS=0640