Merge branch 'release/1.3.0'

Author: mblaschke

CHANGELOG.md

@@ -30,7 +30,7 @@ applications: webdevops/typo3 webdevops/piwik
 misc:      webdevops/mail-sandbox webdevops/sphinx webdevops/liquibase
 
 requirements:
-	pip install -r ./requirements.txt
+	pip install -r ./bin/requirements.txt
 	cd tests/serverspec && bundle install --path=vendor
 
 test:

Makefile

@@ -12,7 +12,19 @@ if [ "$(/usr/bin/whoami)" != "root" ]; then
 fi
 
 function serviceHelp() {
-    echo "Usage: $(basename "$0") <servicename> <stop|start|restart|pid|status>"
+    echo "Usage: $(basename "$0") <servicename> <stop|start|restart|pid|status|check>"
+}
+
+function getServicePid() {
+    local serviceName="$1"
+    local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d")
+
+    if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then
+        echo "not running"
+        exit 1
+    fi
+
+    echo $servicePid
 }
 
 # Param check
@@ -42,10 +54,29 @@ esac
 # Action runner
 #############################
 case "$ACTION" in
-    stop|start|restart|pid|status)
+    stop|start|restart|status)
         exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d"
         ;;
 
+    pid)
+        echo $(getServicePid "${SERVICENAME}")
+        ;;
+
+    check)
+        FIRST_PID=$(getServicePid "${SERVICENAME}")
+        sleep 5
+        SECOND_PID=$(getServicePid "${SERVICENAME}")
+
+        if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then
+            echo "ok"
+            exit 0
+        else
+            echo "not running"
+            exit 1
+        fi
+        ;;
+
+
     *)
         echo "[ERROR] Invalid action"
         serviceHelp

baselayout/usr/local/bin/service

@@ -24,6 +24,7 @@
 import time
 import Queue
 import shutil
+import grp
 from cleo import Output
 from webdevops import Provisioner
 from webdevops.command import BaseCommand
@@ -95,8 +96,17 @@ def __build_base_layout(self):
         if self.option('baselayout'):
             if Output.VERBOSITY_NORMAL <= self.output.get_verbosity():
                 self.line('<info>* </info> Building localscipts')
-            base_path = os.path.join(self.configuration.get('baselayoutPath'), 'baselayout')
-            shutil.make_archive('baselayout', 'bztar', base_path)
+            base_path = self.configuration.get('baselayoutPath')
+
+            root_group = grp.getgrgid(0)
+
+            shutil.make_archive(
+                base_name='baselayout',
+                format='bztar',
+                root_dir=base_path,
+                owner='root',
+                group=root_group.gr_name
+            )
             os.rename('baselayout.tar.bz2', 'baselayout.tar')
 
 

bin/command/generate_provision_command.py

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0

requirements.txt renamed to bin/requirements.txt

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0

docker/ansible/alpine-3/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0

docker/ansible/centos-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0

docker/ansible/debian-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.2.4
+LABEL io.webdevops.version=1.3.0