| 
				
			 | 
			
			
				@@ -163,6 +163,8 @@ OWNCLOUD_ADMIN_PASSWORD= 
			 | 
		
	
		
			
			| 
				163
			 | 
			
				163
			 | 
			
			
				 # Domain name and freedns subdomain for your wiki 
			 | 
		
	
		
			
			| 
				164
			 | 
			
				164
			 | 
			
			
				 WIKI_DOMAIN_NAME= 
			 | 
		
	
		
			
			| 
				165
			 | 
			
				165
			 | 
			
			
				 WIKI_FREEDNS_SUBDOMAIN_CODE= 
			 | 
		
	
		
			
			| 
				
			 | 
			
				166
			 | 
			
			
				+WIKI_ADMIN_PASSWORD= 
			 | 
		
	
		
			
			| 
				
			 | 
			
				167
			 | 
			
			
				+WIKI_TITLE="Freedombone Wiki" 
			 | 
		
	
		
			
			| 
				166
			 | 
			
				168
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				167
			 | 
			
				169
			 | 
			
			
				 # Domain name and freedns subdomain for your blog 
			 | 
		
	
		
			
			| 
				168
			 | 
			
				170
			 | 
			
			
				 FULLBLOG_DOMAIN_NAME= 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -319,6 +321,9 @@ function argument_checks { 
			 | 
		
	
		
			
			| 
				319
			 | 
			
				321
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				320
			 | 
			
				322
			 | 
			
			
				 function read_configuration { 
			 | 
		
	
		
			
			| 
				321
			 | 
			
				323
			 | 
			
			
				   if [ -f $CONFIGURATION_FILE ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				324
			 | 
			
			
				+      if grep -q "WIKI_TITLE" $CONFIGURATION_FILE; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				325
			 | 
			
			
				+          WIKI_TITLE=$(grep "WIKI_TITLE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				326
			 | 
			
			
				+      fi 
			 | 
		
	
		
			
			| 
				322
			 | 
			
				327
			 | 
			
			
				       if grep -q "MY_NAME" $CONFIGURATION_FILE; then 
			 | 
		
	
		
			
			| 
				323
			 | 
			
				328
			 | 
			
			
				           MY_NAME=$(grep "MY_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') 
			 | 
		
	
		
			
			| 
				324
			 | 
			
				329
			 | 
			
			
				       fi 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -3464,6 +3469,14 @@ function install_irc_server { 
			 | 
		
	
		
			
			| 
				3464
			 | 
			
				3469
			 | 
			
			
				   echo 'install_irc_server' >> $COMPLETION_FILE 
			 | 
		
	
		
			
			| 
				3465
			 | 
			
				3470
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				3466
			 | 
			
				3471
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				3472
			 | 
			
			
				+function get_wiki_admin_password { 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3473
			 | 
			
			
				+  if [ -f /home/$MY_USERNAME/README ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3474
			 | 
			
			
				+      if grep -q "Wiki password" /home/$MY_USERNAME/README; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3475
			 | 
			
			
				+          WIKI_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Wiki password:" | awk -F ':' '{print $2}' | sed 's/^ *//') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3476
			 | 
			
			
				+      fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3477
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3478
			 | 
			
			
				+} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3479
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				3467
			 | 
			
				3480
			 | 
			
			
				 function install_wiki { 
			 | 
		
	
		
			
			| 
				3468
			 | 
			
				3481
			 | 
			
			
				   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then 
			 | 
		
	
		
			
			| 
				3469
			 | 
			
				3482
			 | 
			
			
				       return 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -3501,10 +3514,37 @@ function install_wiki { 
			 | 
		
	
		
			
			| 
				3501
			 | 
			
				3514
			 | 
			
			
				   chown www-data /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				3502
			 | 
			
				3515
			 | 
			
			
				   chmod 600 /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				3503
			 | 
			
				3516
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				3504
			 | 
			
				
			 | 
			
			
				-  sed -i "s|//$conf['useacl']|$conf['useacl']|g" /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				3505
			 | 
			
				
			 | 
			
			
				-  sed -i "s|//$conf['superuser']|$conf['superuser']|g" /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3517
			 | 
			
			
				+  sed -i 's|//$conf|$conf|g' /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				3506
			 | 
			
				3518
			 | 
			
			
				   sed -i "s|joe|$MY_USERNAME|g" /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				3507
			 | 
			
				3519
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				3520
			 | 
			
			
				+  sed -i "s|Debian DokuWiki|$WIKI_TITLE|g" /etc/dokuwiki/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3521
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3522
			 | 
			
			
				+  # set the admin user 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3523
			 | 
			
			
				+  sed -i "s/@admin/$MY_USERNAME/g" /etc/dokuwiki/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3524
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3525
			 | 
			
			
				+  # disallow registration of new users 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3526
			 | 
			
			
				+  if ! grep -q "disableactions" /etc/dokuwiki/local.php; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3527
			 | 
			
			
				+      echo "$conf['disableactions'] = 'register'" >> /etc/dokuwiki/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3528
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3529
			 | 
			
			
				+  if ! grep -q "disableactions" /var/lib/dokuwiki/custom/local.php; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3530
			 | 
			
			
				+      echo "$conf['disableactions'] = 'register';" >> /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3531
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3532
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3533
			 | 
			
			
				+  if ! grep -q "authtype" /var/lib/dokuwiki/custom/local.php; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3534
			 | 
			
			
				+      echo "$conf['authtype'] = 'plain';" >> /var/lib/dokuwiki/custom/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3535
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3536
			 | 
			
			
				+  if ! grep -q "authtype" /etc/dokuwiki/local.php; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3537
			 | 
			
			
				+      echo "$conf['authtype'] = 'plain';" >> /etc/dokuwiki/local.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3538
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3539
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3540
			 | 
			
			
				+  get_wiki_admin_password 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3541
			 | 
			
			
				+  if [ ! $WIKI_ADMIN_PASSWORD ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3542
			 | 
			
			
				+      WIKI_ADMIN_PASSWORD=$(openssl rand -base64 16) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3543
			 | 
			
			
				+  fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3544
			 | 
			
			
				+  HASHED_WIKI_PASSWORD=$(echo -n "$WIKI_ADMIN_PASSWORD" | md5sum) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3545
			 | 
			
			
				+  echo -n "$MY_USERNAME:$HASHED_WIKI_PASSWORD:$MY_NAME:$MY_EMAIL:admin,user,upload" > /var/lib/dokuwiki/acl/users.auth.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3546
			 | 
			
			
				+  chmod 640 /var/lib/dokuwiki/acl/users.auth.php 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3547
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				3508
			 | 
			
				3548
			 | 
			
			
				   if ! grep -q "video/ogg" /var/www/$WIKI_DOMAIN_NAME/htdocs/conf/mime.conf; then 
			 | 
		
	
		
			
			| 
				3509
			 | 
			
				3549
			 | 
			
			
				       echo 'ogv     video/ogg' >> /var/www/$WIKI_DOMAIN_NAME/htdocs/conf/mime.conf 
			 | 
		
	
		
			
			| 
				3510
			 | 
			
				3550
			 | 
			
			
				       echo 'mp4     video/mp4' >> /var/www/$WIKI_DOMAIN_NAME/htdocs/conf/mime.conf 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -3697,6 +3737,9 @@ function install_wiki { 
			 | 
		
	
		
			
			| 
				3697
			 | 
			
				3737
			 | 
			
			
				       echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				3698
			 | 
			
				3738
			 | 
			
			
				       echo 'Wiki' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				3699
			 | 
			
				3739
			 | 
			
			
				       echo '====' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3740
			 | 
			
			
				+      echo "Wiki username: $MY_USERNAME" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3741
			 | 
			
			
				+      echo "Wiki password: $WIKI_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				3742
			 | 
			
			
				+      echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				3700
			 | 
			
				3743
			 | 
			
			
				       echo 'Once you have set up the wiki then remove the install file:' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				3701
			 | 
			
				3744
			 | 
			
			
				       echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				3702
			 | 
			
				3745
			 | 
			
			
				       echo "  rm /var/www/$WIKI_DOMAIN_NAME/htdocs/install.php" >> /home/$MY_USERNAME/README 
			 |