4 files changed, 54 insertions, 51 deletions
diff --git a/config/global.properties.example b/config/global.properties.example
deleted file mode 100644
index 1c0c8eb..0000000
--- a/config/global.properties.example
+++ /dev/null
@@ -1,46 +0,0 @@
-#fill in properties and rename to global.properties
-#####################
-#       Main        #
-#####################
-
-# the dir where the images are stored
-storage.dir=/mnt/store/images
-
-#####################
-#       Session     #
-#####################
-
-# session timeout for users (in seconds)
-session.user.timeout=7200
-
-# session timeout for servers (in seconds)
-session.server.timeout=86400
-
-#####################
-#        SSL        #
-#####################
-
-# keystore (.jks format)
-ssl.keystore.file=./config/masterserver.jks
-
-# keystore alias
-ssl.keystore.alias=alias_in_keystore
-
-# keystore password
-ssl.keystore.password=password_for_keystore
-
-############ File transfer
-
-# port that is used for data connection between satellite and master
-filetransfer.port.ssl=9051
-filetransfer.port.plain=9050
-
-# timeout for kicking idling clients (in seconds)
-filetransfer.timeout=60
-filetransfer.retries=4
-
-################## Thrift (RPC)
-
-thrift.port.plain = 9090
-thrift.port.ssl = 9091
-
diff --git a/config/global.properties.tmpl b/config/global.properties.tmpl
new file mode 100644
index 0000000..546c091
--- /dev/null
+++ b/config/global.properties.tmpl
@@ -0,0 +1,47 @@
+#
+# Autogenerated configuration. Do not edit!
+#
+
+#------------------------------------------------------------------------------
+# Main
+#------------------------------------------------------------------------------
+# the dir where the images are stored
+storage.dir = {{ .Env.MASTER_VSTORE_PATH }}
+
+#------------------------------------------------------------------------------
+# Session
+#------------------------------------------------------------------------------
+# session timeout for users (in seconds)
+session.user.timeout = {{ .Env.MASTER_SESSION_TIMEOUT_USER }}
+
+# session timeout for servers (in seconds)
+session.server.timeout = {{ .Env.MASTER_SESSION_TIMEOUT_SERVER }}
+
+#------------------------------------------------------------------------------
+# SSL
+#------------------------------------------------------------------------------
+# keystore (.jks format)
+ssl.keystore.file = {{ .Env.MASTER_KEYSTORE_FILE }}
+
+# keystore alias
+ssl.keystore.alias = {{ .Env.MASTER_KEYSTORE_ALIAS }}
+
+# keystore password
+ssl.keystore.password = {{ .Env.MASTER_KEYSTORE_PASSWORD }}
+
+#------------------------------------------------------------------------------
+# File transfer
+#------------------------------------------------------------------------------
+# port that is used for data connection between satellite and master
+filetransfer.port.ssl = {{ .Env.MASTER_FILE_TRANSFER_PORT_SSL }}
+filetransfer.port.plain = {{ .Env.MASTER_FILE_TRANSFER_PORT_PLAIN }}
+
+# timeout for kicking idling clients (in seconds)
+filetransfer.timeout = {{ .Env.MASTER_FILE_TRANSFER_TIMEOUT }}
+filetransfer.retries = {{ .Env.MASTER_FILE_TRANSFER_RETRIES }}
+
+#------------------------------------------------------------------------------
+# Thrift (RPC)
+#------------------------------------------------------------------------------
+thrift.port.plain = {{ .Env.MASTER_THRIFT_PORT_PLAIN }}
+thrift.port.ssl = {{ .Env.MASTER_THRIFT_PORT_SSL }}
diff --git a/config/mysql.properties.example b/config/mysql.properties.example
deleted file mode 100644
index 3de7085..0000000
--- a/config/mysql.properties.example
+++ /dev/null
@@ -1,5 +0,0 @@
-# Fill in credentials and rename to mysql.properties
-host=localhost
-db=masterserver
-user=masterserver
-password=geheim
diff --git a/config/mysql.properties.tmpl b/config/mysql.properties.tmpl
new file mode 100644
index 0000000..6581ebc
--- /dev/null
+++ b/config/mysql.properties.tmpl
@@ -0,0 +1,7 @@
+#
+# Autogenerated configuration. Do not edit!
+#
+host = {{ .Env.DOZMOD_DATABASE_HOST }}
+db = {{ .Env.DOZMOD_DATABASE_NAME }}
+user = {{ .Env.DOZMOD_DATABASE_USER }}
+password = {{ .Env.DOZMOD_DATABASE_PASSWORD }}