Merge branch 'master' into 'levi'
# Conflicts: # entrypoint.sh
This commit is contained in:
		
						commit
						6c854f8ed5
					
				@ -13,11 +13,14 @@ mkdir -p ARTWORKS/published
 | 
				
			|||||||
# change owner to www-data
 | 
					# change owner to www-data
 | 
				
			||||||
chown -R www-data:www-data ARTWORKS
 | 
					chown -R www-data:www-data ARTWORKS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# initialize database
 | 
				
			||||||
 | 
					cat /database_init.php | php -d display_errors=on -d error_reporting=-1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# substitute server name
 | 
					# substitute server name
 | 
				
			||||||
sed -i "s|ServerName|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
 | 
					sed -i "s|ServerName|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# initialize database
 | 
					# remove index.html
 | 
				
			||||||
cat /database_init.php | php -d display_errors=on -d error_reporting=-1
 | 
					rm /var/www/html/index.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# start webserver
 | 
					# start webserver
 | 
				
			||||||
/usr/sbin/apache2ctl -D FOREGROUND
 | 
					/usr/sbin/apache2ctl -D FOREGROUND
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user