Use the new yaml settings

Signed-off-by: Rémi Duraffort <remi.duraffort@linaro.org>

11 files changed, 28 insertions, 38 deletions

diff --git a/docker-compose.yaml b/docker-compose.yaml
index bdf4ef1..ba61a3f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -13,9 +13,9 @@ services:
     image: ${DC_SERVER_IMAGE}
     volumes:
     - joboutput:/var/lib/lava-server/default/media/job-output
-    - ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
-    - ./overlays/lava-server/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
-    - ./overlays/lava-server/etc/lava-server/lava-logs:/etc/lava-server/lava-logs:ro
+    - ./overlays/etc/lava-server/settings.d/01-database.yaml:/etc/lava-server/settings.d/01-database.yaml:ro
+    - ./overlays/etc/lava-server/settings.d/01-events.yaml:/etc/lava-server/settings.d/01-events.yaml:ro
+    - ./overlays/etc/lava-server/lava-logs:/etc/lava-server/lava-logs:ro
     depends_on:
     - db
     environment:
@@ -30,9 +30,9 @@ services:
     volumes:
     - devices:/etc/lava-server/dispatcher-config/devices:ro
     - health-checks:/etc/lava-server/dispatcher-config/health-checks:ro
-    - ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
-    - ./overlays/lava-server/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
-    - ./overlays/lava-server/etc/lava-server/lava-master:/etc/lava-server/lava-master:ro
+    - ./overlays/etc/lava-server/settings.d/01-database.yaml:/etc/lava-server/settings.d/01-database.yaml:ro
+    - ./overlays/etc/lava-server/settings.d/01-events.yaml:/etc/lava-server/settings.d/01-events.yaml:ro
+    - ./overlays/etc/lava-server/lava-master:/etc/lava-server/lava-master:ro
     depends_on:
     - db
     environment:
@@ -44,8 +44,9 @@ services:
   lava-publisher:
     image: ${DC_SERVER_IMAGE}
     volumes:
-    - ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
-    - ./overlays/lava-publisher/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
+    - ./overlays/etc/lava-server/settings.d/01-database.yaml:/etc/lava-server/settings.d/01-database.yaml:ro
+    - ./overlays/etc/lava-server/settings.d/01-events.yaml:/etc/lava-server/settings.d/01-events.yaml:ro
+    - ./overlays/etc/lava-server/settings.d/02-publisher.yaml:/etc/lava-server/settings.d/02-publisher.yaml:ro
     environment:
       SERVICES: "lava-publisher"
     ports:
@@ -58,8 +59,9 @@ services:
     - devices:/etc/lava-server/dispatcher-config/devices
     - health-checks:/etc/lava-server/dispatcher-config/health-checks
     - joboutput:/var/lib/lava-server/default/media/job-output
-    - ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
-    - ./overlays/lava-server/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
+    - ./overlays/etc/lava-server/settings.d/01-database.yaml:/etc/lava-server/settings.d/01-database.yaml:ro
+    - ./overlays/etc/lava-server/settings.d/01-events.yaml:/etc/lava-server/settings.d/01-events.yaml:ro
+    - ./overlays/etc/lava-server/settings.d/01-unsecure.yaml:/etc/lava-server/settings.d/01-unsecure.yaml:ro
     depends_on:
     - db
     environment:
@@ -80,7 +82,7 @@ services:
   apache2:
     image: ${DC_SERVER_IMAGE}
     volumes:
-    - ./overlays/lava-server/etc/apache2/sites-available/lava-server.conf:/etc/apache2/sites-available/lava-server.conf:ro
+    - ./overlays/etc/apache2/sites-available/lava-server.conf:/etc/apache2/sites-available/lava-server.conf:ro
     depends_on:
     - lava-server
     environment:
diff --git a/overlays/lava-server/etc/apache2/sites-available/lava-server.conf b/overlays/etc/apache2/sites-available/lava-server.conf
index e687e01..e687e01 100644
--- a/overlays/lava-server/etc/apache2/sites-available/lava-server.conf
+++ b/overlays/etc/apache2/sites-available/lava-server.conf
diff --git a/overlays/lava-server/etc/lava-server/lava-logs b/overlays/etc/lava-server/lava-logs
index 1b46f68..1b46f68 100644
--- a/overlays/lava-server/etc/lava-server/lava-logs
+++ b/overlays/etc/lava-server/lava-logs
diff --git a/overlays/lava-server/etc/lava-server/lava-master b/overlays/etc/lava-server/lava-master
index bca867c..bca867c 100644
--- a/overlays/lava-server/etc/lava-server/lava-master
+++ b/overlays/etc/lava-server/lava-master
diff --git a/overlays/etc/lava-server/settings.d/01-database.yaml b/overlays/etc/lava-server/settings.d/01-database.yaml
new file mode 100644
index 0000000..6be9e66
--- /dev/null
+++ b/overlays/etc/lava-server/settings.d/01-database.yaml
@@ -0,0 +1,8 @@
+DATABASES:
+  default:
+    ENGINE: "django.db.backends.postgresql"
+    NAME: "lavaserver"
+    USER: "lavaserver"
+    PASSWORD: "lavaserverdbpass"
+    HOST: "db"
+    PORT: 5432
diff --git a/overlays/etc/lava-server/settings.d/01-events.yaml b/overlays/etc/lava-server/settings.d/01-events.yaml
new file mode 100644
index 0000000..d91abc6
--- /dev/null
+++ b/overlays/etc/lava-server/settings.d/01-events.yaml
@@ -0,0 +1,3 @@
+EVENT_NOTIFICATION: true
+EVENT_TOPIC: "lava-server"
+INTERNAL_EVENT_SOCKET: "tcp://lava-publisher:5557"
diff --git a/overlays/etc/lava-server/settings.d/01-unsecure.yaml b/overlays/etc/lava-server/settings.d/01-unsecure.yaml
new file mode 100644
index 0000000..42611f0
--- /dev/null
+++ b/overlays/etc/lava-server/settings.d/01-unsecure.yaml
@@ -0,0 +1,3 @@
+HTTPS_XML_RPC: false
+CSRF_COOKIE_SECURE: false
+SESSION_COOKIE_SECURE: false
diff --git a/overlays/etc/lava-server/settings.d/02-publisher.yaml b/overlays/etc/lava-server/settings.d/02-publisher.yaml
new file mode 100644
index 0000000..ba965cb
--- /dev/null
+++ b/overlays/etc/lava-server/settings.d/02-publisher.yaml
@@ -0,0 +1 @@
+INTERNAL_EVENT_SOCKET: "tcp://*:5557"
diff --git a/overlays/lava-publisher/etc/lava-server/settings.conf b/overlays/lava-publisher/etc/lava-server/settings.conf
deleted file mode 100644
index 115a68f..0000000
--- a/overlays/lava-publisher/etc/lava-server/settings.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "HTTPS_XML_RPC": false,
-    "MOUNT_POINT": "/",
-    "STATIC_URL": "/static/",
-    "CSRF_COOKIE_SECURE": false,
-    "SESSION_COOKIE_SECURE": false,
-    "EVENT_NOTIFICATION": true,
-    "EVENT_TOPIC": "lava-server",
-    "INTERNAL_EVENT_SOCKET": "tcp://*:5557"
-}
diff --git a/overlays/lava-server/etc/lava-server/instance.conf b/overlays/lava-server/etc/lava-server/instance.conf
deleted file mode 100644
index a1887b2..0000000
--- a/overlays/lava-server/etc/lava-server/instance.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LAVA_INSTANCE="default"
-LAVA_SYS_USER="lavaserver"
-LAVA_DB_NAME="lavaserver"
-LAVA_DB_USER="lavaserver"
-LAVA_DB_SERVER="db"
-LAVA_DB_PORT="5432"
-LAVA_DB_PASSWORD="lavaserverdbpass"
diff --git a/overlays/lava-server/etc/lava-server/settings.conf b/overlays/lava-server/etc/lava-server/settings.conf
deleted file mode 100644
index 57e683e..0000000
--- a/overlays/lava-server/etc/lava-server/settings.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "HTTPS_XML_RPC": false,
-    "MOUNT_POINT": "/",
-    "STATIC_URL": "/static/",
-    "CSRF_COOKIE_SECURE": false,
-    "SESSION_COOKIE_SECURE": false,
-    "EVENT_NOTIFICATION": true,
-    "EVENT_TOPIC": "lava-server",
-    "INTERNAL_EVENT_SOCKET": "tcp://lava-publisher:5557"
-}