|
@@ -75,6 +75,8 @@ function change_password_dokuwiki {
|
75
|
75
|
else
|
76
|
76
|
sed -i "s|$curr_username:.*|$curr_username:$HASHED_DOKUWIKI_PASSWORD:$curr_username:$curr_username@$HOSTNAME:user,upload|g" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
77
|
77
|
fi
|
|
78
|
+ cp /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
|
79
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
78
|
80
|
chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
79
|
81
|
${PROJECT_NAME}-pass -u $curr_username -a dokuwiki -p "$new_user_password"
|
80
|
82
|
fi
|
|
@@ -87,7 +89,9 @@ function add_user_dokuwiki {
|
87
|
89
|
DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
|
88
|
90
|
HASHED_DOKUWIKI_PASSWORD=$(echo -n "$new_user_password" | md5sum | awk -F ' ' '{print $1}')
|
89
|
91
|
echo "$new_username:$HASHED_DOKUWIKI_PASSWORD:$new_username:$new_username@$HOSTNAME:user,upload" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
92
|
+ cp /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
90
|
93
|
chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
94
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
91
|
95
|
${PROJECT_NAME}-pass -u "$new_username" -a dokuwiki -p "$new_user_password"
|
92
|
96
|
}
|
93
|
97
|
|
|
@@ -97,6 +101,7 @@ function remove_user_dokuwiki {
|
97
|
101
|
read_config_param "DOKUWIKI_DOMAIN_NAME"
|
98
|
102
|
if grep "$remove_username:" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php; then
|
99
|
103
|
sed -i "/$remove_username:/d" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
104
|
+ sed -i "/$remove_username:/d" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
100
|
105
|
${PROJECT_NAME}-pass -u "$remove_username" --rmapp dokuwiki
|
101
|
106
|
fi
|
102
|
107
|
}
|
|
@@ -171,6 +176,8 @@ function restore_local_dokuwiki_legacy {
|
171
|
176
|
|
172
|
177
|
chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
|
173
|
178
|
chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
|
|
179
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
180
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
174
|
181
|
chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
|
175
|
182
|
echo $"Restore of Legacy Dokuwiki complete"
|
176
|
183
|
fi
|
|
@@ -217,6 +224,8 @@ function restore_local_dokuwiki {
|
217
|
224
|
fi
|
218
|
225
|
rm -rf ${temp_restore_dir}
|
219
|
226
|
|
|
227
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
228
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
220
|
229
|
chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
|
221
|
230
|
chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
|
222
|
231
|
chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
|
|
@@ -262,6 +271,8 @@ function restore_remote_dokuwiki {
|
262
|
271
|
echo $"Restore of Dokuwiki users complete"
|
263
|
272
|
fi
|
264
|
273
|
|
|
274
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
275
|
+ chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
265
|
276
|
chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/data
|
266
|
277
|
chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/lib
|
267
|
278
|
chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
|
|
@@ -329,12 +340,11 @@ function install_dokuwiki {
|
329
|
340
|
|
330
|
341
|
echo '<?php' > /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
331
|
342
|
echo "\$conf['title'] = '${DOKUWIKI_TITLE}';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
|
343
|
+ echo "\$conf['lang'] = 'en';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
332
|
344
|
echo "\$conf['license'] = 'cc-by-sa';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
333
|
345
|
echo "\$conf['useacl'] = 1;" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
334
|
|
- echo "\$conf['superuser'] = '${MY_USERNAME}';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
|
346
|
+ echo "\$conf['superuser'] = '@admin';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
335
|
347
|
echo "\$conf['disableactions'] = 'register';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
336
|
|
- echo "\$conf['plugin']['authmysql']['TablesToLock'] = array();" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
337
|
|
- echo "\$conf['authtype'] = 'authplain';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
338
|
348
|
ln -s /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/local.php
|
339
|
349
|
|
340
|
350
|
chmod 600 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
|
|
@@ -351,6 +361,7 @@ function install_dokuwiki {
|
351
|
361
|
fi
|
352
|
362
|
HASHED_DOKUWIKI_PASSWORD=$(echo -n "$DOKUWIKI_ADMIN_PASSWORD" | md5sum | awk -F ' ' '{print $1}')
|
353
|
363
|
echo -n "$MY_USERNAME:$HASHED_DOKUWIKI_PASSWORD:$MY_NAME:$MY_EMAIL:admin,user,upload" > /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
|
364
|
+ cp /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
|
354
|
365
|
chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
|
355
|
366
|
|
356
|
367
|
if ! grep -q "video/ogg" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf; then
|