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 .= "\n"; $version = "73"; - $OUT .= "\n"; - $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n"; - $OUT .= "\n"; + $OUT .= " \n"; + $OUT .= " SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n"; + $OUT .= " \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) {