| 
				
			 | 
			
			
				@@ -8919,8 +8919,6 @@ function install_blog { 
			 | 
		
	
		
			
			| 
				8919
			 | 
			
				8919
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				8920
			 | 
			
				8920
			 | 
			
			
				   cd /var/www/$FULLBLOG_DOMAIN_NAME 
			 | 
		
	
		
			
			| 
				8921
			 | 
			
				8921
			 | 
			
			
				   git clone https://github.com/danpros/htmly htdocs 
			 | 
		
	
		
			
			| 
				8922
			 | 
			
				
			 | 
			
			
				-  # This is a workaround until a better solution 
			 | 
		
	
		
			
			| 
				8923
			 | 
			
				
			 | 
			
			
				-  git checkout 4842796 -b tempbranch 
			 | 
		
	
		
			
			| 
				8924
			 | 
			
				8922
			 | 
			
			
				   chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs 
			 | 
		
	
		
			
			| 
				8925
			 | 
			
				8923
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				8926
			 | 
			
				8924
			 | 
			
			
				   if [ ! -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.dhparam ]; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -9130,10 +9128,11 @@ function install_blog { 
			 | 
		
	
		
			
			| 
				9130
			 | 
			
				9128
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				9131
			 | 
			
				9129
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				9132
			 | 
			
				9130
			 | 
			
			
				   # create a user 
			 | 
		
	
		
			
			| 
				9133
			 | 
			
				
			 | 
			
			
				-  cp /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/username.ini.example /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				9134
			 | 
			
				
			 | 
			
			
				-  HASHED_BLOG_PASSWORD="$(echo -n $FULLBLOG_ADMIN_PASSWORD | sha256sum  | awk -F ' ' '{print $1}')" 
			 | 
		
	
		
			
			| 
				9135
			 | 
			
				
			 | 
			
			
				-  sed -i "s|yourpassword|$HASHED_BLOG_PASSWORD|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				9136
			 | 
			
				
			 | 
			
			
				-  sed -i 's/encryption = clear/encryption = "sha256"/g' /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9131
			 | 
			
			
				+  echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9132
			 | 
			
			
				+  echo "password = '$FULLBLOG_ADMIN_PASSWORD'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9133
			 | 
			
			
				+  echo 'encryption = clear' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9134
			 | 
			
			
				+  echo ';Role' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9135
			 | 
			
			
				+  echo 'role = admin' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini 
			 | 
		
	
		
			
			| 
				9137
			 | 
			
				9136
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				9138
			 | 
			
				9137
			 | 
			
			
				   nginx_ensite $FULLBLOG_DOMAIN_NAME 
			 | 
		
	
		
			
			| 
				9139
			 | 
			
				9138
			 | 
			
			
				   service php5-fpm restart 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -9956,8 +9955,8 @@ function create_upgrade_script { 
			 | 
		
	
		
			
			| 
				9956
			 | 
			
				9955
			 | 
			
			
				   echo "  cd /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9957
			 | 
			
				9956
			 | 
			
			
				   echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9958
			 | 
			
				9957
			 | 
			
			
				   echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9959
			 | 
			
				
			 | 
			
			
				-  echo '  #git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9960
			 | 
			
				
			 | 
			
			
				-  echo "  #chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9958
			 | 
			
			
				+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				9959
			 | 
			
			
				+  echo "  chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9961
			 | 
			
				9960
			 | 
			
			
				   echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9962
			 | 
			
				9961
			 | 
			
			
				   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 | 
		
	
		
			
			| 
				9963
			 | 
			
				9962
			 | 
			
			
				   echo "if grep -Fxq \"install_owncloud_music_app\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME 
			 |