From 899242a5fbdfc7a911413c973aa7a07165e266c1 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Fri, 20 Feb 2015 17:57:53 +0000
Subject: [PATCH] Changes the way to handle private files
---
scripts/provision.sh | 4 +++-
unit-files/lamp@.service | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/provision.sh b/scripts/provision.sh
index 96dfb1e..d5e7108 100755
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -86,7 +86,7 @@ function scaffold () {
fi
info "Creating application folder"
- mkdir -p ${FOLDER}
+ mkdir -p ${APP_FOLDER}
info "Creating .env"
echo "EMAIL=${arg_e}" > ${FOLDER}/.env
@@ -96,6 +96,7 @@ function scaffold () {
echo DOCKER_ARGUMENTS="-v ${APP_FOLDER}/www-content:/app" >> ${FOLDER}/.env
;;
"wordpress" )
+ touch ${APP_FOLDER}/.htaccess
echo APPLICATION=${arg_a} >> ${FOLDER}/.env
echo DOCKER_ARGUMENTS="--link mysql-${arg_u}:db \
-v ${APP_FOLDER}/data:/app/wp-content \
@@ -103,6 +104,7 @@ function scaffold () {
--env-file ${APP_FOLDER}/.env" >> ${FOLDER}/.env
;;
"known" )
+ touch ${APP_FOLDER}/.htaccess
echo APPLICATION=${arg_a} >> ${FOLDER}/.env
echo DOCKER_ARGUMENTS="--link mysql-${arg_u}:db \
-v ${APP_FOLDER}/data:/app/Uploads \
diff --git a/unit-files/lamp@.service b/unit-files/lamp@.service
index cdbe6ae..71afd93 100644
--- a/unit-files/lamp@.service
+++ b/unit-files/lamp@.service
@@ -18,9 +18,7 @@ RemainAfterExit=yes
EnvironmentFile=/data/domains/%i/.env
ExecStart=/bin/bash -euxc ' \
application_folder=/data/domains/%i/${APPLICATION}; \
- if [ ! -d $application_folder ]; then \
- mkdir -p $application_folder; \
- touch $application_folder/.htaccess; \
+ if [ ! -f $application_folder/.env ]; then \
cat /data/domains/%i/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > $application_folder/.env; \
fi;'
--
GitLab