Fügt environment file für systemds unit file hinzu.

3 files changed, 34 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 4666222..b797ff6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ start.sh
 _env.sh
 import.go
 mailer
+environment
diff --git a/Makefile b/Makefile
index 123e1f6..fa8d2e5 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,7 @@ clean: kill
 	@(rm _env.sh 1>&2 2>/dev/null && echo "Removing _env.sh...") || true
 	@(rm $(APP) 2>/dev/null && echo "Removing binary ($(APP))...") || true
 	@(rm start.sh 1>&2 2>/dev/null && echo "Removing startup script...") || true
+	@(rm environment 1>&2 2>/dev/null && echo "Removing environment file...") || true
 	@echo "Done."
 
 build: import
@@ -92,7 +93,7 @@ postgresql: create_import
 database_all: sqlite3 mysql postgresql
 	@echo "Created import file for all databases."
 
-pack: gen_config
+pack: gen_env gen_config
 	echo "#!/bin/bash" > start.sh && \
 	echo 'DIR=$$( cd "$$( dirname "$${BASH_SOURCE[0]}" )" && pwd )' >> start.sh && \
 	echo 'cd "$$DIR"' >> start.sh && \
@@ -102,7 +103,7 @@ pack: gen_config
 	if [ ! -d $(FREEMAIL_DB_DIR) ]; then \
 		mkdir $(FREEMAIL_DB_DIR); \
 	fi
-	tar czf $(APP).tar.gz start.sh $(APP) _env.sh html static $(FREEMAIL_DB_DIR) statistics 2>/dev/null && \
+	tar czf $(APP).tar.gz start.sh $(APP) _env.sh html static $(FREEMAIL_DB_DIR) statistics environment 2>/dev/null && \
 	rm start.sh 2>/dev/null && \
 	echo "\n/$(APP).tar.gz is ready." || \
 	(echo "Run \"make build\" first." && exit 1)
@@ -193,3 +194,32 @@ _test_vagrant_env:
 
 vagrant: _test_vagrant_env go_get build pack
 	mv $(APP).tar.gz $(VAGRANT_DIR)
+
+gen_env:
+	@echo "Generating environment file!\n"
+	@echo "# Database" >> environment
+	echo "FREEMAIL_DB_DRIVER=$(FREEMAIL_DB_DRIVER)" >> environment
+	echo "FREEMAIL_DB_CREDENTIALS=$(FREEMAIL_DB_CREDENTIALS)" >> environment
+	echo "FREEMAIL_DB_IMPORT_DRIVER=$(FREEMAIL_DB_IMPORT_DRIVER)" >> environment
+	echo "FREEMAIL_DB_LOG=$(FREEMAIL_DB_LOG)\n" >> environment
+	@echo ""
+	@echo "# Redis" >> environment
+	echo "FREEMAIL_REDIS_SERVER=$(FREEMAIL_REDIS_SERVER)" >> environment
+	echo "FREEMAIL_REDIS_PORT=$(FREEMAIL_REDIS_PORT)\n" >> environment
+	@echo ""
+	@echo "# Http" >> environment
+	echo "FREEMAIL_HTTP_IP=$(FREEMAIL_HTTP_IP)" >> environment
+	echo "FREEMAIL_HTTP_PORT=$(FREEMAIL_HTTP_PORT)" >> environment
+	@echo ""
+	@if [ ! -z "$(FREEMAIL_SECRET)" ]; then \
+		echo "FREEMAIL_SECRET=$(FREEMAIL_SECRET)" >> environment; \
+	else \
+		echo "FREEMAIL_SECRET=$$(echo $$RANDOM | sha256sum | cut -d ' ' -f1 )" >> environment; \
+	fi
+	@echo ""
+	@echo "# Smtp" >> environment
+	echo "FREEMAIL_SMTP_MAILER_MX=$(FREEMAIL_SMTP_MAILER_MX)" >> environment
+	echo "FREEMAIL_SMTP_PASSWORD=$(FREEMAIL_SMTP_PASSWORD)" >> environment
+	echo "FREEMAIL_SMTP_ADRESS=$(FREEMAIL_SMTP_ADRESS)" >> environment
+	echo "LOGDIR=$(LOGDIR)" >> environment
+
diff --git a/env.sh b/env.sh
index b5485b3..a485e30 100755
--- a/env.sh
+++ b/env.sh
@@ -6,7 +6,7 @@ export FREEMAIL_DB_DRIVER=sqlite3
 export FREEMAIL_DB_CREDENTIALS=./db/freemail.db
 export FREEMAIL_DB_IMPORT_DRIVER=github.com/mattn/go-sqlite3
 export FREEMAIL_DB_LOG=false
-export FREEMAIL_SECRET=verylongsecret
+export FREEMAIL_SECRET=
 
 # Redis
 #export FREEMAIL_REDIS_SERVER=127.0.0.1