| 
				
			 | 
			
			
				@@ -210,7 +210,7 @@ function install_mediagoblin { 
			 | 
		
	
		
			
			| 
				210
			 | 
			
				210
			 | 
			
			
				     install_nodejs mediagoblin 
			 | 
		
	
		
			
			| 
				211
			 | 
			
				211
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				212
			 | 
			
				212
			 | 
			
			
				     apt-get install -yq python python-dev python-lxml python-imaging python-virtualenv 
			 | 
		
	
		
			
			| 
				213
			 | 
			
				
			 | 
			
			
				-    apt-get install -yq automake perl sqlite 
			 | 
		
	
		
			
			| 
				
			 | 
			
				213
			 | 
			
			
				+    apt-get install -yq automake perl sqlite python-paste python-pastedeploy python-pastescript 
			 | 
		
	
		
			
			| 
				214
			 | 
			
				214
			 | 
			
			
				     useradd -c "GNU MediaGoblin system account" -d /var/lib/mediagoblin -m -r -g www-data mediagoblin 
			 | 
		
	
		
			
			| 
				215
			 | 
			
				215
			 | 
			
			
				     groupadd mediagoblin 
			 | 
		
	
		
			
			| 
				216
			 | 
			
				216
			 | 
			
			
				     usermod --append -G mediagoblin mediagoblin 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -225,7 +225,7 @@ function install_mediagoblin { 
			 | 
		
	
		
			
			| 
				225
			 | 
			
				225
			 | 
			
			
				     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ./bootstrap.sh" -mediagoblin 
			 | 
		
	
		
			
			| 
				226
			 | 
			
				226
			 | 
			
			
				     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ./configure" - mediagoblin 
			 | 
		
	
		
			
			| 
				227
			 | 
			
				227
			 | 
			
			
				     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && make" - mediagoblin 
			 | 
		
	
		
			
			| 
				228
			 | 
			
				
			 | 
			
			
				-    su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && bin/easy_install flup==1.0.3.dev-20110405" - mediaGoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				228
			 | 
			
			
				+    su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && bin/easy_install flup==1.0.3.dev-20110405" - mediagoblin 
			 | 
		
	
		
			
			| 
				229
			 | 
			
				229
			 | 
			
			
				     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ln -s /var/lib/mediagoblin user_dev" - mediagoblin 
			 | 
		
	
		
			
			| 
				230
			 | 
			
				230
			 | 
			
			
				     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && bash -c 'cp -av mediagoblin.ini mediagoblin_local.ini && cp -av paste.ini paste_local.ini'" - mediagoblin 
			 | 
		
	
		
			
			| 
				231
			 | 
			
				231
			 | 
			
			
				     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && perl -pi -e 's|.*sql_engine = .*|sql_engine = sqlite:////var/lib/mediagoblin/mediagoblin.db|' mediagoblin_local.ini" - mediagoblin 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -253,6 +253,7 @@ function install_mediagoblin { 
			 | 
		
	
		
			
			| 
				253
			 | 
			
				253
			 | 
			
			
				             MEDIAGOBLIN_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" 
			 | 
		
	
		
			
			| 
				254
			 | 
			
				254
			 | 
			
			
				         fi 
			 | 
		
	
		
			
			| 
				255
			 | 
			
				255
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				256
			 | 
			
			
				+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a mediagoblin -p "$MEDIAGOBLIN_ADMIN_PASSWORD" 
			 | 
		
	
		
			
			| 
				256
			 | 
			
				257
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				257
			 | 
			
				258
			 | 
			
			
				     MEDIAGOBLIN_ONION_HOSTNAME=$(add_onion_service mediagoblin 80 ${MEDIAGOBLIN_ONION_PORT}) 
			 | 
		
	
		
			
			| 
				258
			 | 
			
				259
			 | 
			
			
				     set_completion_param "mediagoblin domain" "${MEDIAGOBLIN_DOMAIN_NAME}" 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -399,8 +400,6 @@ function install_mediagoblin { 
			 | 
		
	
		
			
			| 
				399
			 | 
			
				400
			 | 
			
			
				     function_check add_ddns_domain 
			 | 
		
	
		
			
			| 
				400
			 | 
			
				401
			 | 
			
			
				     add_ddns_domain $MEDIAGOBLIN_DOMAIN_NAME 
			 | 
		
	
		
			
			| 
				401
			 | 
			
				402
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				402
			 | 
			
				
			 | 
			
			
				-    ${PROJECT_NAME}-pass -u $MY_USERNAME -a mediagoblin -p "$MEDIAGOBLIN_ADMIN_PASSWORD" 
			 | 
		
	
		
			
			| 
				403
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				404
			 | 
			
				403
			 | 
			
			
				     APP_INSTALLED=1 
			 | 
		
	
		
			
			| 
				405
			 | 
			
				404
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				406
			 | 
			
				405
			 | 
			
			
				  
			 |