| 1 |
diff -urN smeserver-dokuwiki-0.3.0.old/createlinks smeserver-dokuwiki-0.3.0/createlinks |
| 2 |
--- smeserver-dokuwiki-0.3.0.old/createlinks 2022-06-20 21:04:05.000000000 +0400 |
| 3 |
+++ smeserver-dokuwiki-0.3.0/createlinks 2022-06-23 18:56:59.000000000 +0400 |
| 4 |
@@ -7,3 +7,61 @@ |
| 5 |
|
| 6 |
templates2events("/etc/dokuwiki/local.protected.php", qw(webapps-update bootstrap-console-save smeserver-dokuwiki-update)); |
| 7 |
|
| 8 |
+use esmith::Build::Backup qw(:all); |
| 9 |
+backup_includes("smeserver-dokuwiki", qw( |
| 10 |
+/etc/dokuwiki/acl.auth.php |
| 11 |
+/etc/dokuwiki/acronyms.conf |
| 12 |
+/etc/dokuwiki/entities.conf |
| 13 |
+/etc/dokuwiki/interwiki.conf |
| 14 |
+/etc/dokuwiki/local.php |
| 15 |
+/etc/dokuwiki/plugins.local.php |
| 16 |
+/etc/dokuwiki/scheme.conf |
| 17 |
+/var/lib/dokuwiki/data |
| 18 |
+/usr/share/dokuwiki/lib/plugins |
| 19 |
+)); |
| 20 |
+ |
| 21 |
+# data temp dir, plugins from rpm dokuwiki-plugins and dokuwiki |
| 22 |
+backup_excludes("smeserver-dokuwiki", qw( |
| 23 |
+/var/lib/dokuwiki/data/cache |
| 24 |
+/var/lib/dokuwiki/data/locks |
| 25 |
+/var/lib/dokuwiki/data/tmp |
| 26 |
+/usr/share/dokuwiki/lib/plugins/acl |
| 27 |
+/usr/share/dokuwiki/lib/plugins/action.php |
| 28 |
+/usr/share/dokuwiki/lib/plugins/admin.php |
| 29 |
+/usr/share/dokuwiki/lib/plugins/authad |
| 30 |
+/usr/share/dokuwiki/lib/plugins/authhttpldap |
| 31 |
+/usr/share/dokuwiki/lib/plugins/authldap |
| 32 |
+/usr/share/dokuwiki/lib/plugins/authpdo |
| 33 |
+/usr/share/dokuwiki/lib/plugins/auth.php |
| 34 |
+/usr/share/dokuwiki/lib/plugins/authplain |
| 35 |
+/usr/share/dokuwiki/lib/plugins/cli.php |
| 36 |
+/usr/share/dokuwiki/lib/plugins/config |
| 37 |
+/usr/share/dokuwiki/lib/plugins/extension |
| 38 |
+/usr/share/dokuwiki/lib/plugins/index.html |
| 39 |
+/usr/share/dokuwiki/lib/plugins/info |
| 40 |
+/usr/share/dokuwiki/lib/plugins/popularity |
| 41 |
+/usr/share/dokuwiki/lib/plugins/remote.php |
| 42 |
+/usr/share/dokuwiki/lib/plugins/revert |
| 43 |
+/usr/share/dokuwiki/lib/plugins/safefnrecode |
| 44 |
+/usr/share/dokuwiki/lib/plugins/styling |
| 45 |
+/usr/share/dokuwiki/lib/plugins/syntax.php |
| 46 |
+/usr/share/dokuwiki/lib/plugins/usermanager |
| 47 |
+/usr/share/dokuwiki/lib/plugins/changes |
| 48 |
+/usr/share/dokuwiki/lib/plugins/ckgedit |
| 49 |
+/usr/share/dokuwiki/lib/plugins/color |
| 50 |
+/usr/share/dokuwiki/lib/plugins/dw2pdf |
| 51 |
+/usr/share/dokuwiki/lib/plugins/edittable |
| 52 |
+/usr/share/dokuwiki/lib/plugins/encryptedpasswords |
| 53 |
+/usr/share/dokuwiki/lib/plugins/hidden |
| 54 |
+/usr/share/dokuwiki/lib/plugins/howhard |
| 55 |
+/usr/share/dokuwiki/lib/plugins/loglog |
| 56 |
+/usr/share/dokuwiki/lib/plugins/note |
| 57 |
+/usr/share/dokuwiki/lib/plugins/nspages |
| 58 |
+/usr/share/dokuwiki/lib/plugins/odt |
| 59 |
+/usr/share/dokuwiki/lib/plugins/pagelist |
| 60 |
+/usr/share/dokuwiki/lib/plugins/pagemove |
| 61 |
+/usr/share/dokuwiki/lib/plugins/sortablejs |
| 62 |
+/usr/share/dokuwiki/lib/plugins/tag |
| 63 |
+/usr/share/dokuwiki/lib/plugins/todo |
| 64 |
+)); |
| 65 |
+# |
| 66 |
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 |
| 67 |
--- 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 |
| 68 |
+++ smeserver-dokuwiki-0.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dokuwiki 2022-06-22 22:37:24.000000000 +0400 |
| 69 |
@@ -2,13 +2,13 @@ |
| 70 |
|
| 71 |
if (($dokuwiki{'status'} || 'disabled') eq 'enabled'){ |
| 72 |
my $alias = (($dokuwiki{'AliasOnPrimary'} || 'enabled') eq 'enabled' ) ? 'Alias /dokuwiki /usr/share/dokuwiki':''; |
| 73 |
- my $allow = (($dokuwiki{'access'} || 'private') eq 'public') ? 'all':"$localAccess $externalSSLAccess"; |
| 74 |
+ my $allow = (($dokuwiki{'access'} || 'private') eq 'public') ? 'all granted':"ip $localAccess $externalSSLAccess"; |
| 75 |
my $auth = (($dokuwiki{'Authentication'} || 'internal') eq 'http') ? "AuthName \"Dokuwiki\"\n" . |
| 76 |
" AuthType Basic\n" . |
| 77 |
- " AuthExternal pwauth\n" . |
| 78 |
- " Require valid-user\n" : ''; |
| 79 |
+ " AuthBasicProvider external\n" . |
| 80 |
+ " AuthExternal pwauth\n" : ''; |
| 81 |
my $ssl = (($dokuwiki{'RequireSSL'} || 'enabled') =~ m/^(enabled|yes|on)$/i) ? |
| 82 |
- 'SSLRequireSSL on':'# SSL is not encforced'; |
| 83 |
+ 'SSLRequireSSL on':'# SSL is not enforced'; |
| 84 |
my $maxsize = $dokuwiki{'MaxUploadSize'} || '200'; |
| 85 |
$maxsize .= 'M' unless ($maxsize =~ m/M$/); |
| 86 |
my $php =<<_EOF; |
| 87 |
@@ -29,66 +29,68 @@ |
| 88 |
$php =<<_EOF; |
| 89 |
|
| 90 |
<FilesMatch \\.php\$> |
| 91 |
- SetHandler "proxy:unix:/var/run/php-fpm/php__PHP_VERSION__-dokuwiki.sock|fcgi://localhost" |
| 92 |
+ SetHandler "proxy:unix:/var/run/php-fpm/php74-dokuwiki.sock|fcgi://localhost" |
| 93 |
</FilesMatch> |
| 94 |
_EOF |
| 95 |
} |
| 96 |
|
| 97 |
- $OUT .=<<"EOF"; |
| 98 |
+ $OUT .=<<_EOF; |
| 99 |
|
| 100 |
$alias |
| 101 |
|
| 102 |
<Directory /usr/share/dokuwiki> |
| 103 |
AllowOverride None |
| 104 |
Options +FollowSymlinks |
| 105 |
- Order Allow,Deny |
| 106 |
- Allow from $allow |
| 107 |
$ssl |
| 108 |
- $auth |
| 109 |
+_EOF |
| 110 |
+ |
| 111 |
+ if ( $auth ) { |
| 112 |
+ $OUT .= " $auth\n" . |
| 113 |
+ " <RequireAll>\n" . |
| 114 |
+ " Require $allow\n" . |
| 115 |
+ " Require valid-user\n" . |
| 116 |
+ " </RequireAll>\n"; |
| 117 |
+ } else { |
| 118 |
+ $OUT .= "Require $allow\n"; |
| 119 |
+ } |
| 120 |
+ |
| 121 |
+ $OUT .=<<_EOF; |
| 122 |
$php |
| 123 |
</Directory> |
| 124 |
|
| 125 |
<Directory /usr/share/dokuwiki/inc> |
| 126 |
- Order Deny,Allow |
| 127 |
- Deny from all |
| 128 |
+ Require all denied |
| 129 |
</Directory> |
| 130 |
|
| 131 |
<Directory /usr/share/dokuwiki/inc/lang> |
| 132 |
- Order Deny,Allow |
| 133 |
- Deny from all |
| 134 |
+ Require all denied |
| 135 |
</Directory> |
| 136 |
|
| 137 |
<Directory /usr/share/dokuwiki/lib/_fla> |
| 138 |
## no access to the fla directory |
| 139 |
- Order allow,deny |
| 140 |
- Deny from all |
| 141 |
+ Require all denied |
| 142 |
</Directory> |
| 143 |
|
| 144 |
## no access to the conf directory |
| 145 |
<Directory /etc/dokuwiki> |
| 146 |
- Order allow,deny |
| 147 |
- Deny from all |
| 148 |
+ Require all denied |
| 149 |
</Directory> |
| 150 |
<Directory /usr/share/dokuwiki/conf> |
| 151 |
- Order allow,deny |
| 152 |
- Deny from all |
| 153 |
+ Require all denied |
| 154 |
</Directory> |
| 155 |
|
| 156 |
## no access to the data directory |
| 157 |
<Directory /usr/share/dokuwiki/data> |
| 158 |
- Order allow,deny |
| 159 |
- Deny from all |
| 160 |
+ Require all denied |
| 161 |
</Directory> |
| 162 |
<Directory /var/lib/dokuwiki> |
| 163 |
- Order allow,deny |
| 164 |
- Deny from all |
| 165 |
+ Require all denied |
| 166 |
</Directory> |
| 167 |
|
| 168 |
|
| 169 |
-EOF |
| 170 |
+_EOF |
| 171 |
|
| 172 |
-} |
| 173 |
-else { |
| 174 |
+} else { |
| 175 |
$OUT .=<<'EOF'; |
| 176 |
|
| 177 |
# Dokuwiki is disabled |
| 178 |
@@ -98,6 +100,4 @@ |
| 179 |
|
| 180 |
EOF |
| 181 |
} |
| 182 |
- |
| 183 |
} |
| 184 |
- |
Parent Directory
| 
Revision Log
| 
Revision Graph
