From 73c316d8823264d4ef68e7631f1114414f54a09c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Br=C3=BCckl?= <andreas.brueckl@datenpol.at>
Date: Tue, 25 Jul 2017 16:00:44 +0200
Subject: [PATCH] =?UTF-8?q?Server-Config=20wird=20nicht=20mehr=20ben=C3=B6?=
 =?UTF-8?q?tigt,=20da=20jetzt=20direkt=20im=20puppet-Script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ext/config/odoo-server.conf | 41 -------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 ext/config/odoo-server.conf

diff --git a/ext/config/odoo-server.conf b/ext/config/odoo-server.conf
deleted file mode 100644
index d2b1242e..00000000
--- a/ext/config/odoo-server.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-[options]
-addons_path = ~/ext/ext/custom-addons,~/ext/ext/odoo/addons
-admin_passwd = c76EVdqj
-
-db_host = False
-db_name = False
-db_password = False
-db_port = False
-db_user = False
-
-debug_mode = False
-list_db = True
-log_level = warn
-
-#max_cron_threads = 1
-#workers = 1
-
-xmlrpc_interface = 127.0.0.1
-# WILL BE OVERWRITTEN BY COMMAND LINE ARGS
-xmlrpc_port = 8069
-longpolling_port = 8072
-logfile = /var/log/odoo/odoo-server.log
-
-timezone = Europe/Brussels
-
-# 5 min
-#limit_time_cpu  = 300
-# 10 min
-#limit_time_real = 600
-
-# input DMI:
-limit_time_cpu  = 3000
-limit_time_real = 6000
-
-# if DB > 150MB, otherwise "AccessDenied" error occurs
-# 10 GB
-limit_memory_hard = 10000000000
-
-# Use a new worker for the next request if 400MB is reached
-# The worker will be recycled after the current request
-limit_memory_soft = 400000000