Merge 5087823d0c into 5fb6a84274
				
					
				
			This commit is contained in:
		
						commit
						140ed2a4ae
					
				@ -1,12 +1,16 @@
 | 
			
		||||
[options]
 | 
			
		||||
addons_path = /mnt/extra-addons
 | 
			
		||||
data_dir = /var/lib/odoo
 | 
			
		||||
db_name = postgress
 | 
			
		||||
db_host = db
 | 
			
		||||
db_port = 5432
 | 
			
		||||
db_user = odoo
 | 
			
		||||
db_password = odoo
 | 
			
		||||
dbfilter = .*
 | 
			
		||||
; admin_passwd = admin
 | 
			
		||||
; csv_internal_sep = ,
 | 
			
		||||
; db_maxconn = 64
 | 
			
		||||
; db_name = False
 | 
			
		||||
; db_template = template1
 | 
			
		||||
; dbfilter = .*
 | 
			
		||||
; debug_mode = False
 | 
			
		||||
; email_from = False
 | 
			
		||||
; limit_memory_hard = 2684354560
 | 
			
		||||
 | 
			
		||||
@ -1,12 +1,16 @@
 | 
			
		||||
[options]
 | 
			
		||||
addons_path = /mnt/extra-addons
 | 
			
		||||
data_dir = /var/lib/odoo
 | 
			
		||||
db_name = postgress
 | 
			
		||||
db_host = db
 | 
			
		||||
db_port = 5432
 | 
			
		||||
db_user = odoo
 | 
			
		||||
db_password = odoo
 | 
			
		||||
dbfilter = .*
 | 
			
		||||
; admin_passwd = admin
 | 
			
		||||
; csv_internal_sep = ,
 | 
			
		||||
; db_maxconn = 64
 | 
			
		||||
; db_name = False
 | 
			
		||||
; db_template = template1
 | 
			
		||||
; dbfilter = .*
 | 
			
		||||
; debug_mode = False
 | 
			
		||||
; email_from = False
 | 
			
		||||
; limit_memory_hard = 2684354560
 | 
			
		||||
 | 
			
		||||
@ -1,12 +1,16 @@
 | 
			
		||||
[options]
 | 
			
		||||
addons_path = /mnt/extra-addons
 | 
			
		||||
data_dir = /var/lib/odoo
 | 
			
		||||
db_name = postgress
 | 
			
		||||
db_host = db
 | 
			
		||||
db_port = 5432
 | 
			
		||||
db_user = odoo
 | 
			
		||||
db_password = odoo
 | 
			
		||||
dbfilter = .*
 | 
			
		||||
; admin_passwd = admin
 | 
			
		||||
; csv_internal_sep = ,
 | 
			
		||||
; db_maxconn = 64
 | 
			
		||||
; db_name = False
 | 
			
		||||
; db_template = template1
 | 
			
		||||
; dbfilter = .*
 | 
			
		||||
; debug_mode = False
 | 
			
		||||
; email_from = False
 | 
			
		||||
; limit_memory_hard = 2684354560
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user