prosody, retain logs.

Config/HugoExample/files/main.sh

@@ -18,22 +18,26 @@ typeset -u DEV
 echo "DEV='$DEV'"
 
 SITE="/var/www/hugo/site"
+CLONE="/var/www/hugo/site-new"
 
 echo "*** Creating Git Repo ***"
-if [[ -d $SITE ]]; then
+sudo -u www-data git clone --recurse-submodules $BRANCH $REPO $CLONE
-	rm -rfv $SITE
-fi
-sudo -u www-data git clone --recurse-submodules $BRANCH $REPO $SITE
 status="$?"
 
 echo "*** Validating Git Repo ***"
-if [[ $status != 0 || ! -d $SITE/.git ]]; then
+if [[ $status != 0 || ! -d $CLONE/.git ]]; then
 	echo "ERROR: Hugo project may not have cloned correctly. status='$status'"
 	echo "Aborting."
 	exit 1
 fi
 echo "* Site exists!"
 
+echo "*** Copying Git Repo ***"
+if [[ -d $SITE ]]; then
+	rm -rfv $SITE
+fi
+mv -v $CLONE $SITE
+
 echo "*** Copying Static Files to NGINX ***"
 rm -rfv /var/www/html/*
 sudo -u www-data /var/www/hugo/cronjob.sh

Config/Prosody/docker-compose.example.localbuild.yml

@@ -20,6 +20,12 @@ volumes:
       type: none
       device: ../../Volumes/ReverseProxy/letsencrypt/archive
       o: bind
+  prosody_logs:
+    driver: local
+    driver_opts:
+      type: none
+      device: ../../Volumes/Prosody/logs
+      o: bind
 
 services:
   app:
@@ -45,6 +51,7 @@ services:
     #  start_period: 30s
     volumes:
       - prosody_data:/var/lib/prosody/
+      - prosody_logs:/var/log/prosody/
       - prosody_certs:/etc/letsencrypt/live
       - prosody_cert_archive:/etc/letsencrypt/archive
     deploy:

Config/Prosody/prep.sh

@@ -12,6 +12,7 @@ source $DIR/.env
 
 # Create folders.
 mkdir -pv ../../Volumes/Prosody/data
+mkdir -pv ../../Volumes/Prosody/logs
 
 # Finish successfully.
 exit 0

Config/ProvisionTests/bin/main.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
 
-REPO_NAME="git-repo"
+local_clone="git-repo"
 
-sh -c "rm -rfv $LOCAL_REPO_NAME"
+sh -c "rm -rfv $local_clone"
 
 echo "Downloading Repo '$REPO' : Branch '$BRANCH'"
-git clone $REPO --branch=$BRANCH $LOCAL_REPO_NAME
+git clone $REPO --branch=$BRANCH $local_clone
 
-cd $LOCAL_REPO_NAME
+cd $local_clone
 
 echo "Starting Executable Script '$EXEC'"
 
+if [[ "$KEEP_ALIVE" == "Y" ]]; then
 	tail -F /var/mail/mail &
 	tail -F /var/mail/ansible &
+fi
 
 logfile="/root/test.log"
 $EXEC > $logfile &

Config/ProvisionTests/docker-compose.example.yml

@@ -20,13 +20,14 @@ services:
       args:
         PACKAGES: ${PACKAGES}
         EXTRA_ARCH: ${EXTRA_ARCH}
-    restart: no
+    restart: "no"
     environment:
       - PACKAGES=$PACKAGES
       - EXTRA_ARCH=$EXTRA_ARCH
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
+      - KEEP_ALIVE=$KEEP_ALIVE
     volumes:
       - type: volume
         source: pt-storage
@@ -49,13 +50,14 @@ services:
       args:
         PACKAGES: ${PACKAGES}
         EXTRA_DEBIAN: ${EXTRA_DEBIAN}
-    restart: no
+    restart: "no"
     environment:
       - PACKAGES=$PACKAGES
       - EXTRA_DEBIAN=$EXTRA_DEBIAN
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
+      - KEEP_ALIVE=$KEEP_ALIVE
     volumes:
       - type: volume
         source: pt-storage
@@ -78,13 +80,14 @@ services:
       args:
         PACKAGES: ${PACKAGES}
         EXTRA_FEDORA: ${EXTRA_FEDORA}
-    restart: no
+    restart: "no"
     environment:
       - PACKAGES=$PACKAGES
       - EXTRA_FEDORA=$EXTRA_FEDORA
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
+      - KEEP_ALIVE=$KEEP_ALIVE
     volumes:
       - type: volume
         source: pt-storage
@@ -107,13 +110,14 @@ services:
       args:
         PACKAGES: ${PACKAGES}
         EXTRA_OPENSUSE: ${EXTRA_OPENSUSE}
-    restart: no
+    restart: "no"
     environment:
       - PACKAGES=$PACKAGES
       - EXTRA_OPENSUSE=$EXTRA_OPENSUSE
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
+      - KEEP_ALIVE=$KEEP_ALIVE
     volumes:
       - type: volume
         source: pt-storage
@@ -136,13 +140,14 @@ services:
       args:
         PACKAGES: ${PACKAGES}
         EXTRA_UBUNTU: ${EXTRA_UBUNTU}
-    restart: no
+    restart: "no"
     environment:
       - PACKAGES=$PACKAGES
       - EXTRA_UBUNTU=$EXTRA_UBUNTU
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
+      - KEEP_ALIVE=$KEEP_ALIVE
     volumes:
       - type: volume
         source: pt-storage

Config/ProvisionTests/example.env

@@ -21,3 +21,4 @@ EXTRA_UBUNTU=""
 REPO=https://git.hyperling.com/me/env-ansible
 BRANCH=stage
 EXEC="./setup.sh -l -g -s"
+#KEEP_ALIVE=Y

bin/manage.sh

@@ -151,13 +151,13 @@ if [[ -n $up || -n $down || -n $build || -n $pull || -n $maintenance ]]; then
 		pwd
 
 		# Ensure env file exists so that all compose variables are populated.
-		if [[ -e ./example.env && ! -e ./.env ]]; then
+		if [[ -e "./example.env" && ! -e "./.env" && -f "docker-compose.yml" ]]; then
 			echo "WARNING: .env file was not found, copying example as placeholder."
 			cp -v example.env .env
 		fi
 
 		# Ensure all configuration files have been created.
-		if [[ -d ./config ]]; then
+		if [[ -d "./config" && -f "docker-compose.yml" ]]; then
 			ls ./config/*.example 2>/dev/null | while read example; do
 				real=${example//.example/}
 				if [[ ! -e $real ]]; then
@@ -168,12 +168,12 @@ if [[ -n $up || -n $down || -n $build || -n $pull || -n $maintenance ]]; then
 		fi
 
 		# Run the prep script to create any necessary volumes.
-		if [[ -f prep.sh ]]; then
+		if [[ -f "prep.sh" && -f "docker-compose.yml" ]]; then
 			./prep.sh
 		fi
 
-		# Run any maintenance scripts associate with the container.
+		# Run any maintenance scripts associated with the container.
-		if [[ "$maintenance" == "Y" ]]; then
+		if [[ "$maintenance" == "Y" && -f "docker-compose.yml" ]]; then
 			if [[ -f "maintenance.sh" ]]; then
 				./maintenance.sh
 			fi