From 788510972caa1865814bb7052b1525ce1a86d506 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 9 Jun 2017 18:02:59 +0100
Subject: [PATCH] docuwiki configuration

---
 src/freedombone-app-dokuwiki | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index 06d957b3..3cc7a7b5 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -75,6 +75,8 @@ function change_password_dokuwiki {
         else
             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
         fi
+        cp /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
+        chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
         chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
         ${PROJECT_NAME}-pass -u $curr_username -a dokuwiki -p "$new_user_password"
     fi
@@ -87,7 +89,9 @@ function add_user_dokuwiki {
     DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
     HASHED_DOKUWIKI_PASSWORD=$(echo -n "$new_user_password" | md5sum | awk -F ' ' '{print $1}')
     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
+    cp /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
     chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
     ${PROJECT_NAME}-pass -u "$new_username" -a dokuwiki -p "$new_user_password"
 }
 
@@ -97,6 +101,7 @@ function remove_user_dokuwiki {
     read_config_param "DOKUWIKI_DOMAIN_NAME"
     if grep "$remove_username:" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php; then
         sed -i "/$remove_username:/d" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
+        sed -i "/$remove_username:/d" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
         ${PROJECT_NAME}-pass -u "$remove_username" --rmapp dokuwiki
     fi
 }
@@ -171,6 +176,8 @@ function restore_local_dokuwiki_legacy {
 
         chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
         chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
+        chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
+        chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
         chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
         echo $"Restore of Legacy Dokuwiki complete"
     fi
@@ -217,6 +224,8 @@ function restore_local_dokuwiki {
     fi
     rm -rf ${temp_restore_dir}
 
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
     chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
     chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
     chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
@@ -262,6 +271,8 @@ function restore_remote_dokuwiki {
         echo $"Restore of Dokuwiki users complete"
     fi
 
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
     chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/data
     chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/lib
     chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
@@ -329,12 +340,11 @@ function install_dokuwiki {
 
     echo '<?php' > /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
     echo "\$conf['title'] = '${DOKUWIKI_TITLE}';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
+    echo "\$conf['lang'] = 'en';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
     echo "\$conf['license'] = 'cc-by-sa';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
     echo "\$conf['useacl'] = 1;" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
-    echo "\$conf['superuser'] = '${MY_USERNAME}';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
+    echo "\$conf['superuser'] = '@admin';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
     echo "\$conf['disableactions'] = 'register';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
-    echo "\$conf['plugin']['authmysql']['TablesToLock'] = array();" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
-    echo "\$conf['authtype'] = 'authplain';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
     ln -s /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/local.php
 
     chmod 600 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
@@ -351,6 +361,7 @@ function install_dokuwiki {
     fi
     HASHED_DOKUWIKI_PASSWORD=$(echo -n "$DOKUWIKI_ADMIN_PASSWORD" | md5sum | awk -F ' ' '{print $1}')
     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
+    cp /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/users.auth.php
     chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
 
     if ! grep -q "video/ogg" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf; then