From 1487d1e129f5668f0ccf23c19e1371d19c9a119f Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Wed, 13 Jun 2018 08:21:31 +0530
Subject: [PATCH] Switch airsonic back to SQLite

---
 media/airsonic.tf                  | 9 ++++-----
 media/conf/airsonic.properties.tpl | 6 ------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/media/airsonic.tf b/media/airsonic.tf
index ec2f644..1d4f96d 100644
--- a/media/airsonic.tf
+++ b/media/airsonic.tf
@@ -19,7 +19,7 @@ resource "docker_container" "airsonic" {
     file    = "/usr/lib/jvm/java-1.8-openjdk/jre/lib/sound.properties"
   }
   volumes {
-    host_path      = "/mnt/xwing/config/airsonic/data"
+    host_path      = "/mnt/xwing/config/airsonic2"
     container_path = "/config"
   }
   volumes {
@@ -45,10 +45,8 @@ resource "docker_container" "airsonic" {
     "PUID=1004",
     "PGID=1003",
     "TZ=Asia/Kolkata",
-    "JAVA_OPTS=-Xmx512m",
+    "JAVA_OPTS=-Xmx512m -Dserver.use-forward-headers=true -Dserver.context-path=/",
   ]
-
-  # links = ["${var.links-mariadb}"]
 }
 
 resource "docker_image" "airsonic" {
@@ -65,6 +63,7 @@ data "template_file" "airsonic-properties-file" {
 
   vars {
     smtp-password = "${var.airsonic-smtp-password}"
-    db-password   = "${var.airsonic-db-password}"
+
+    # db-password   = "${var.airsonic-db-password}"
   }
 }
diff --git a/media/conf/airsonic.properties.tpl b/media/conf/airsonic.properties.tpl
index adbe0ec..2e4eb99 100644
--- a/media/conf/airsonic.properties.tpl
+++ b/media/conf/airsonic.properties.tpl
@@ -33,9 +33,3 @@ SmtpPort=465
 SmtpUser=airsonic@captnemo.in
 SmtpFrom=airsonic@captnemo.in
 SmtpPassword=${smtp-password}
-
-DatabaseConfigType=embed
-DatabaseConfigEmbedDriver=org.hsqldb.jdbcDriver
-DatabaseConfigEmbedUrl=jdbc:mysql://mariadb:3306/airsonic
-DatabaseConfigEmbedUsername=airsonic
-DatabaseConfigEmbedPassword=${db-password}