mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	incorporate Jerrys fixes, that merges cleanly (#93)
This commit is contained in:
		
							parent
							
								
									29b0b50885
								
							
						
					
					
						commit
						c6554cb005
					
				
					 5 changed files with 1 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -7,7 +7,6 @@ proxy_user: squid
 | 
			
		|||
apache_service: httpd
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_config_dir: httpd/conf.d
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_log_dir: /var/log/httpd
 | 
			
		||||
smb_service: smb
 | 
			
		||||
nmb_service: nmb
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,6 @@ proxy_user: squid
 | 
			
		|||
apache_service: httpd
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_config_dir: httpd/conf.d
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_log_dir: /var/log/httpd
 | 
			
		||||
smb_service: smb
 | 
			
		||||
nmb_service: nmb
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,6 @@ proxy_user: squid
 | 
			
		|||
apache_service: httpd
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_config_dir: httpd/conf.d
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_log_dir: /var/log/httpd
 | 
			
		||||
smb_service: smb
 | 
			
		||||
nmb_service: nmb
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,6 @@ dns_user: bind
 | 
			
		|||
proxy: squid3
 | 
			
		||||
proxy_user: proxy
 | 
			
		||||
apache_service: apache2
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_config_dir: apache2/sites-available
 | 
			
		||||
apache_user: www-data
 | 
			
		||||
apache_log_dir: /var/log/apache2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,9 +5,8 @@ dns_user: bind
 | 
			
		|||
proxy: squid
 | 
			
		||||
proxy_user: proxy
 | 
			
		||||
apache_service: apache2
 | 
			
		||||
apache_user: apache
 | 
			
		||||
apache_config_dir: apache2/sites-available
 | 
			
		||||
apache_user: www-data
 | 
			
		||||
apache_config_dir: apache2/sites-available
 | 
			
		||||
apache_log_dir: /var/log/apache2
 | 
			
		||||
smb_service: smbd
 | 
			
		||||
nmb_service: nmbd
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue