smeserver-wordpress/contribs10/smeserver-wordpress-1.2-Add-backup-folders-to-createlinks.patch

diff -urN smeserver-wordpress-1.2.old/createlinks smeserver-wordpress-1.2/createlinks
--- smeserver-wordpress-1.2.old/createlinks     2022-07-31 11:25:04.708240161 +0100
+++ smeserver-wordpress-1.2/createlinks 2022-07-31 12:10:03.194996634 +0100
@@ -77,3 +77,8 @@
 {
        safe_symlink("../actions/wordpress", "root/etc/e-smith/events/$event/20wordpress");
 }
+
+use esmith::Build::Backup qw(:all);
+backup_includes("smeserver-wordpress", qw(
+/usr/share/wordpress/wp-content
+));
diff -urN smeserver-wordpress-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress smeserver-wordpress-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress
--- smeserver-wordpress-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress        2022-07-31 11:25:04.709240165 +0100
+++ smeserver-wordpress-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress    2022-08-01 15:40:50.254150336 +0100
@@ -4,7 +4,7 @@
             unless $status eq 'enabled';
 
    $OUT = "";
-    my $allow = 'all';
+    my $allow = 'all granted';
     my $pass = '0';
     my $satisfy = 'all';
     my $name = $wordpress{'Name'} || 'Wordpress weblog';
@@ -19,31 +19,31 @@
           }
           elsif ($wordpress{'PublicAccess'} eq 'local')
           {
-            $allow   = $localAccess;
+            $allow   = "ip $localAccess";
             $pass    = 0;
             $satisfy = 'all';
           }
           elsif ($wordpress{'PublicAccess'} eq 'local-pw')
           {
-            $allow   = $localAccess;
+            $allow   = "ip $localAccess";
             $pass    = 1;
             $satisfy = 'all';
           }
           elsif ($wordpress{'PublicAccess'} eq 'global')
           {
-            $allow   = 'all';
+            $allow   = 'all granted';
             $pass    = 0;
             $satisfy = 'all';
           }
           elsif ($wordpress{'PublicAccess'} eq 'global-pw')
           {
-            $allow   = 'all';
+            $allow   = 'all granted';
             $pass    = 1;
             $satisfy = 'all';
           }
           elsif ($wordpress{'PublicAccess'} eq 'global-pw-remote')
           {
-            $allow   = $localAccess;
+            $allow   = "ip $localAccess";
             $pass    = 1;
             $satisfy = 'any';
           }
@@ -66,24 +66,27 @@
       $OUT .= "<Directory /usr/share/wordpress>\n";
 
          $version = "73";
-         $OUT .= "<FilesMatch \.php\$\>\n";
-         $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n";
-         $OUT .= "</FilesMatch>\n";
+         $OUT .= "     <FilesMatch \.php\$\>\n";
+         $OUT .= "             SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n";
+         $OUT .= "     </FilesMatch>\n";
 
       $OUT .= "    AddType application/x-httpd-php .php\n";
-      $OUT .= "    #php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n";
+      #$OUT .= "    php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n";
       $OUT .= "    Options ";
       $OUT .= " FollowSymLinks " if ( ($wordpress{'SymLinks'} || 'disabled') eq 'enabled');
       $OUT .= " Indexes " if ( ($wordpress{'Indexes'} || 'disabled') eq 'enabled');
       $OUT .= " None " if ((($wordpress{'Indexes'} || 'disabled') ne 'enabled') && (($wordpress{'SymLinks'} || 'disabled') ne 'enabled'));
       $OUT .= "\n    AllowOverride All" if ( ($wordpress{'AllowOverrideAll'} || 'disabled') eq 'enabled');
-      $OUT .= "\n    order deny,allow\n";
-      $OUT .= "    deny from all\n";
-      $OUT .= "    allow from $allow\n";
-      $OUT .= "    #php_value mysql.default_host $wordpress{DbName}\n";
-      $OUT .= "    #php_value mysql.default_user $wordpress{DbUser}\n";
-      $OUT .= "    #php_value mysql.default_password $wordpress{DbPassword}\n";
-      $OUT .= "    #php_admin_value upload_tmp_dir /tmp\n";
+      
+      #$OUT .= "\n    order deny,allow\n";
+      #$OUT .= "    deny from all\n";
+      #$OUT .= "    allow from $allow\n";
+      $OUT .= "\n      Require $allow \n";
+      
+      #$OUT .= "    php_value mysql.default_host $wordpress{DbName}\n";
+      #$OUT .= "    php_value mysql.default_user $wordpress{DbUser}\n";
+      #$OUT .= "    php_value mysql.default_password $wordpress{DbPassword}\n";
+      #$OUT .= "    php_admin_value upload_tmp_dir /tmp\n";
 
       if ($pass)
       {
1	diff -urN smeserver-wordpress-1.2.old/createlinks smeserver-wordpress-1.2/createlinks
2	--- smeserver-wordpress-1.2.old/createlinks 2022-07-31 11:25:04.708240161 +0100
3	+++ smeserver-wordpress-1.2/createlinks 2022-07-31 12:10:03.194996634 +0100
4	@@ -77,3 +77,8 @@
5	{
6	safe_symlink("../actions/wordpress", "root/etc/e-smith/events/$event/20wordpress");
7	}
8	+
9	+use esmith::Build::Backup qw(:all);
10	+backup_includes("smeserver-wordpress", qw(
11	+/usr/share/wordpress/wp-content
12	+));
13	diff -urN smeserver-wordpress-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress smeserver-wordpress-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress
14	--- smeserver-wordpress-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress 2022-07-31 11:25:04.709240165 +0100
15	+++ smeserver-wordpress-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92wordpress 2022-08-01 15:40:50.254150336 +0100
16	@@ -4,7 +4,7 @@
17	unless $status eq 'enabled';
18
19	$OUT = "";
20	- my $allow = 'all';
21	+ my $allow = 'all granted';
22	my $pass = '0';
23	my $satisfy = 'all';
24	my $name = $wordpress{'Name'} \|\| 'Wordpress weblog';
25	@@ -19,31 +19,31 @@
26	}
27	elsif ($wordpress{'PublicAccess'} eq 'local')
28	{
29	- $allow = $localAccess;
30	+ $allow = "ip $localAccess";
31	$pass = 0;
32	$satisfy = 'all';
33	}
34	elsif ($wordpress{'PublicAccess'} eq 'local-pw')
35	{
36	- $allow = $localAccess;
37	+ $allow = "ip $localAccess";
38	$pass = 1;
39	$satisfy = 'all';
40	}
41	elsif ($wordpress{'PublicAccess'} eq 'global')
42	{
43	- $allow = 'all';
44	+ $allow = 'all granted';
45	$pass = 0;
46	$satisfy = 'all';
47	}
48	elsif ($wordpress{'PublicAccess'} eq 'global-pw')
49	{
50	- $allow = 'all';
51	+ $allow = 'all granted';
52	$pass = 1;
53	$satisfy = 'all';
54	}
55	elsif ($wordpress{'PublicAccess'} eq 'global-pw-remote')
56	{
57	- $allow = $localAccess;
58	+ $allow = "ip $localAccess";
59	$pass = 1;
60	$satisfy = 'any';
61	}
62	@@ -66,24 +66,27 @@
63	$OUT .= "<Directory /usr/share/wordpress>\n";
64
65	$version = "73";
66	- $OUT .= "<FilesMatch \.php\$\>\n";
67	- $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock\|fcgi://localhost\"\n";
68	- $OUT .= "</FilesMatch>\n";
69	+ $OUT .= " <FilesMatch \.php\$\>\n";
70	+ $OUT .= " SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock\|fcgi://localhost\"\n";
71	+ $OUT .= " </FilesMatch>\n";
72
73	$OUT .= " AddType application/x-httpd-php .php\n";
74	- $OUT .= " #php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n";
75	+ #$OUT .= " php_admin_value open_basedir /usr/share/wordpress:/etc/wordpress:/tmp/:/usr/share/pear:/usr/share/php/\n";
76	$OUT .= " Options ";
77	$OUT .= " FollowSymLinks " if ( ($wordpress{'SymLinks'} \|\| 'disabled') eq 'enabled');
78	$OUT .= " Indexes " if ( ($wordpress{'Indexes'} \|\| 'disabled') eq 'enabled');
79	$OUT .= " None " if ((($wordpress{'Indexes'} \|\| 'disabled') ne 'enabled') && (($wordpress{'SymLinks'} \|\| 'disabled') ne 'enabled'));
80	$OUT .= "\n AllowOverride All" if ( ($wordpress{'AllowOverrideAll'} \|\| 'disabled') eq 'enabled');
81	- $OUT .= "\n order deny,allow\n";
82	- $OUT .= " deny from all\n";
83	- $OUT .= " allow from $allow\n";
84	- $OUT .= " #php_value mysql.default_host $wordpress{DbName}\n";
85	- $OUT .= " #php_value mysql.default_user $wordpress{DbUser}\n";
86	- $OUT .= " #php_value mysql.default_password $wordpress{DbPassword}\n";
87	- $OUT .= " #php_admin_value upload_tmp_dir /tmp\n";
88	+
89	+ #$OUT .= "\n order deny,allow\n";
90	+ #$OUT .= " deny from all\n";
91	+ #$OUT .= " allow from $allow\n";
92	+ $OUT .= "\n Require $allow \n";
93	+
94	+ #$OUT .= " php_value mysql.default_host $wordpress{DbName}\n";
95	+ #$OUT .= " php_value mysql.default_user $wordpress{DbUser}\n";
96	+ #$OUT .= " php_value mysql.default_password $wordpress{DbPassword}\n";
97	+ #$OUT .= " php_admin_value upload_tmp_dir /tmp\n";
98
99	if ($pass)
100	{