diff -urN smeserver-dokuwiki-0.3.0.old/createlinks smeserver-dokuwiki-0.3.0/createlinks
--- smeserver-dokuwiki-0.3.0.old/createlinks 2022-06-20 21:04:05.000000000 +0400
+++ smeserver-dokuwiki-0.3.0/createlinks 2022-06-23 18:56:59.000000000 +0400
@@ -7,3 +7,61 @@
templates2events("/etc/dokuwiki/local.protected.php", qw(webapps-update bootstrap-console-save smeserver-dokuwiki-update));
+use esmith::Build::Backup qw(:all);
+backup_includes("smeserver-dokuwiki", qw(
+/etc/dokuwiki/acl.auth.php
+/etc/dokuwiki/acronyms.conf
+/etc/dokuwiki/entities.conf
+/etc/dokuwiki/interwiki.conf
+/etc/dokuwiki/local.php
+/etc/dokuwiki/plugins.local.php
+/etc/dokuwiki/scheme.conf
+/var/lib/dokuwiki/data
+/usr/share/dokuwiki/lib/plugins
+));
+
+# data temp dir, plugins from rpm dokuwiki-plugins and dokuwiki
+backup_excludes("smeserver-dokuwiki", qw(
+/var/lib/dokuwiki/data/cache
+/var/lib/dokuwiki/data/locks
+/var/lib/dokuwiki/data/tmp
+/usr/share/dokuwiki/lib/plugins/acl
+/usr/share/dokuwiki/lib/plugins/action.php
+/usr/share/dokuwiki/lib/plugins/admin.php
+/usr/share/dokuwiki/lib/plugins/authad
+/usr/share/dokuwiki/lib/plugins/authhttpldap
+/usr/share/dokuwiki/lib/plugins/authldap
+/usr/share/dokuwiki/lib/plugins/authpdo
+/usr/share/dokuwiki/lib/plugins/auth.php
+/usr/share/dokuwiki/lib/plugins/authplain
+/usr/share/dokuwiki/lib/plugins/cli.php
+/usr/share/dokuwiki/lib/plugins/config
+/usr/share/dokuwiki/lib/plugins/extension
+/usr/share/dokuwiki/lib/plugins/index.html
+/usr/share/dokuwiki/lib/plugins/info
+/usr/share/dokuwiki/lib/plugins/popularity
+/usr/share/dokuwiki/lib/plugins/remote.php
+/usr/share/dokuwiki/lib/plugins/revert
+/usr/share/dokuwiki/lib/plugins/safefnrecode
+/usr/share/dokuwiki/lib/plugins/styling
+/usr/share/dokuwiki/lib/plugins/syntax.php
+/usr/share/dokuwiki/lib/plugins/usermanager
+/usr/share/dokuwiki/lib/plugins/changes
+/usr/share/dokuwiki/lib/plugins/ckgedit
+/usr/share/dokuwiki/lib/plugins/color
+/usr/share/dokuwiki/lib/plugins/dw2pdf
+/usr/share/dokuwiki/lib/plugins/edittable
+/usr/share/dokuwiki/lib/plugins/encryptedpasswords
+/usr/share/dokuwiki/lib/plugins/hidden
+/usr/share/dokuwiki/lib/plugins/howhard
+/usr/share/dokuwiki/lib/plugins/loglog
+/usr/share/dokuwiki/lib/plugins/note
+/usr/share/dokuwiki/lib/plugins/nspages
+/usr/share/dokuwiki/lib/plugins/odt
+/usr/share/dokuwiki/lib/plugins/pagelist
+/usr/share/dokuwiki/lib/plugins/pagemove
+/usr/share/dokuwiki/lib/plugins/sortablejs
+/usr/share/dokuwiki/lib/plugins/tag
+/usr/share/dokuwiki/lib/plugins/todo
+));
+#
diff -urN smeserver-dokuwiki-0.3.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dokuwiki smeserver-dokuwiki-0.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dokuwiki
--- smeserver-dokuwiki-0.3.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dokuwiki 2022-06-20 21:04:05.000000000 +0400
+++ smeserver-dokuwiki-0.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dokuwiki 2022-06-22 22:37:24.000000000 +0400
@@ -2,13 +2,13 @@
if (($dokuwiki{'status'} || 'disabled') eq 'enabled'){
my $alias = (($dokuwiki{'AliasOnPrimary'} || 'enabled') eq 'enabled' ) ? 'Alias /dokuwiki /usr/share/dokuwiki':'';
- my $allow = (($dokuwiki{'access'} || 'private') eq 'public') ? 'all':"$localAccess $externalSSLAccess";
+ my $allow = (($dokuwiki{'access'} || 'private') eq 'public') ? 'all granted':"ip $localAccess $externalSSLAccess";
my $auth = (($dokuwiki{'Authentication'} || 'internal') eq 'http') ? "AuthName \"Dokuwiki\"\n" .
" AuthType Basic\n" .
- " AuthExternal pwauth\n" .
- " Require valid-user\n" : '';
+ " AuthBasicProvider external\n" .
+ " AuthExternal pwauth\n" : '';
my $ssl = (($dokuwiki{'RequireSSL'} || 'enabled') =~ m/^(enabled|yes|on)$/i) ?
- 'SSLRequireSSL on':'# SSL is not encforced';
+ 'SSLRequireSSL on':'# SSL is not enforced';
my $maxsize = $dokuwiki{'MaxUploadSize'} || '200';
$maxsize .= 'M' unless ($maxsize =~ m/M$/);
my $php =<<_EOF;
@@ -29,66 +29,68 @@
$php =<<_EOF;
- SetHandler "proxy:unix:/var/run/php-fpm/php__PHP_VERSION__-dokuwiki.sock|fcgi://localhost"
+ SetHandler "proxy:unix:/var/run/php-fpm/php74-dokuwiki.sock|fcgi://localhost"
_EOF
}
- $OUT .=<<"EOF";
+ $OUT .=<<_EOF;
$alias
AllowOverride None
Options +FollowSymlinks
- Order Allow,Deny
- Allow from $allow
$ssl
- $auth
+_EOF
+
+ if ( $auth ) {
+ $OUT .= " $auth\n" .
+ " \n" .
+ " Require $allow\n" .
+ " Require valid-user\n" .
+ " \n";
+ } else {
+ $OUT .= "Require $allow\n";
+ }
+
+ $OUT .=<<_EOF;
$php
- Order Deny,Allow
- Deny from all
+ Require all denied
- Order Deny,Allow
- Deny from all
+ Require all denied
## no access to the fla directory
- Order allow,deny
- Deny from all
+ Require all denied
## no access to the conf directory
- Order allow,deny
- Deny from all
+ Require all denied
- Order allow,deny
- Deny from all
+ Require all denied
## no access to the data directory
- Order allow,deny
- Deny from all
+ Require all denied
- Order allow,deny
- Deny from all
+ Require all denied
-EOF
+_EOF
-}
-else {
+} else {
$OUT .=<<'EOF';
# Dokuwiki is disabled
@@ -98,6 +100,4 @@
EOF
}
-
}
-