--- mcore-src/trunk/mcore-tools/Makefile.inc	2014/01/13 14:12:34	2252
+++ mcore-src/trunk/mcore-tools/Makefile.inc	2015/09/08 09:08:17	2474
@@ -15,6 +15,7 @@
 
 MCORE_LIBDIR = $(LIBDIR)/mcored
 MCORE_CHROOTDIR = $(LOCALSTATEDIR)/lib/mcored
+MCORE_CONFIG_PATH = $(SYSCONFDIR)/mcore/config.d
 MCORE_DISTRIBUTION = mCore
 MCORE_DEFAULT_HOSTNAME = mcore
 MCORE_DEFAULT_DOMAIN = mcoredomain.domain
@@ -22,6 +23,12 @@
 MCORE_UNPRIV_GROUP = users
 MCORE_UNPRIV_HOME = /home/$(MCORE_UNPRIV_USER)
 MCORE_CONTROL_SERVER = mcorectl.localdomain.local
+MCORE_CERT_FILE = $(SSLDIR)/certs/mcored.pem
+MCORE_KEY_FILE = $(SSLDIR)/private/mcored.key
+MCORE_SQL_HOST = localhost
+MCORE_SQL_DB = mcoredb
+MCORE_SQL_USER = mcore
+MCORE_SQL_PASS = mc0r3
 
 SYSTEMINIT = systemd
 SPLASH = plymouth
@@ -46,13 +53,20 @@
 		-e "s:@@SSLDIR@@:$(SSLDIR):g" \
 		-e "s:@@MCORE_LIBDIR@@:$(MCORE_LIBDIR):g" \
 		-e "s:@@MCORE_CHROOTDIR@@:$(MCORE_CHROOTDIR):g" \
+		-e "s:@@MCORE_CONFIG_PATH@@:$(MCORE_CONFIG_PATH):g" \
 		-e "s:@@MCORE_DISTRIBUTION@@:$(MCORE_DISTRIBUTION):g" \
 		-e "s:@@MCORE_DEFAULT_DOMAIN@@:$(MCORE_DEFAULT_DOMAIN):g" \
 		-e "s:@@MCORE_DEFAULT_HOSTNAME@@:$(MCORE_DEFAULT_HOSTNAME):g" \
 		-e "s:@@MCORE_CONTROL_SERVER@@:$(MCORE_CONTROL_SERVER):g" \
+		-e "s:@@MCORE_CERT_FILE@@:$(MCORE_CERT_FILE):g" \
+		-e "s:@@MCORE_KEY_FILE@@:$(MCORE_KEY_FILE):g" \
 		-e "s:@@MCORE_UNPRIV_USER@@:$(MCORE_UNPRIV_USER):g" \
 		-e "s:@@MCORE_UNPRIV_GROUP@@:$(MCORE_UNPRIV_GROUP):g" \
-		-e "s:@@MCORE_UNPRIV_HOME@@:$(MCORE_UNPRIV_HOME):g"
+		-e "s:@@MCORE_UNPRIV_HOME@@:$(MCORE_UNPRIV_HOME):g" \
+		-e "s:@@MCORE_SQL_HOST@@:$(MCORE_SQL_HOST):g" \
+		-e "s:@@MCORE_SQL_DB@@:$(MCORE_SQL_DB):g" \
+		-e "s:@@MCORE_SQL_USER@@:$(MCORE_SQL_USER):g" \
+		-e "s:@@MCORE_SQL_PASS@@:$(MCORE_SQL_PASS):g"
 
 SCRIPT_SED_COMMAND = \
 	$(SED) \