Update goreplace to 0.5.0

webdevops · Apr 6, 2017 · 0a120bc · 0a120bc
1 parent a49af8a
commit 0a120bc
Show file tree

Hide file tree

Showing 148 changed files with 596 additions and 2,947 deletions.
diff --git a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh
@@ -1,6 +1,5 @@
 go-replace \
-    -s "<WEB_NO_CACHE_PATTERN>" \
-    -r "$WEB_NO_CACHE_PATTERN" \
+    -s "<WEB_NO_CACHE_PATTERN>" -r "$WEB_NO_CACHE_PATTERN" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh
@@ -6,42 +6,16 @@ fi
 
 # Replace markers
 go-replace \
-    -s "<DOCUMENT_INDEX>" \
-    -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_INDEX>" -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_ROOT>" -r "$WEB_DOCUMENT_ROOT" \
+    -s "<ALIAS_DOMAIN>" -r "$WEB_ALIAS_DOMAIN" \
+    -s "<SERVERNAME>" -r "$HOSTNAME" \
+    -s "<PHP_SOCKET>" -r "$WEB_PHP_SOCKET" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
 
-go-replace \
-    -s "<DOCUMENT_ROOT>" \
-    -r "$WEB_DOCUMENT_ROOT" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<ALIAS_DOMAIN>" \
-    -r "$WEB_ALIAS_DOMAIN" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<SERVERNAME>" \
-    -r "$HOSTNAME" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
-    ## WEB_PHP_SOCKET is set
-    go-replace \
-        -s "<PHP_SOCKET>" \
-        -r "$WEB_PHP_SOCKET" \
-        --path=/opt/docker/etc/httpd/ \
-        --path-pattern='*.conf' \
-        --ignore-empty
-else
+if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then
     ## WEB_PHP_SOCKET is not set, remove PHP files
     rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
 fi
diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh
@@ -6,42 +6,16 @@ fi
 
 # Replace markers
 go-replace \
-    -s "<DOCUMENT_INDEX>" \
-    -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_INDEX>" -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_ROOT>" -r "$WEB_DOCUMENT_ROOT" \
+    -s "<ALIAS_DOMAIN>" -r "$WEB_ALIAS_DOMAIN" \
+    -s "<SERVERNAME>" -r "$HOSTNAME" \
+    -s "<PHP_SOCKET>" -r "$WEB_PHP_SOCKET" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
 
-go-replace \
-    -s "<DOCUMENT_ROOT>" \
-    -r "$WEB_DOCUMENT_ROOT" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<ALIAS_DOMAIN>" \
-    -r "$WEB_ALIAS_DOMAIN" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<SERVERNAME>" \
-    -r "$HOSTNAME" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
-    ## WEB_PHP_SOCKET is set
-    go-replace \
-        -s "<PHP_SOCKET>" \
-        -r "$WEB_PHP_SOCKET" \
-        --path=/opt/docker/etc/httpd/ \
-        --path-pattern='*.conf' \
-        --ignore-empty
-else
+if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then
     ## WEB_PHP_SOCKET is not set, remove PHP files
     rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
 fi
diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh
@@ -6,42 +6,16 @@ fi
 
 # Replace markers
 go-replace \
-    -s "<DOCUMENT_INDEX>" \
-    -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_INDEX>" -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_ROOT>" -r "$WEB_DOCUMENT_ROOT" \
+    -s "<ALIAS_DOMAIN>" -r "$WEB_ALIAS_DOMAIN" \
+    -s "<SERVERNAME>" -r "$HOSTNAME" \
+    -s "<PHP_SOCKET>" -r "$WEB_PHP_SOCKET" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
 
-go-replace \
-    -s "<DOCUMENT_ROOT>" \
-    -r "$WEB_DOCUMENT_ROOT" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<ALIAS_DOMAIN>" \
-    -r "$WEB_ALIAS_DOMAIN" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<SERVERNAME>" \
-    -r "$HOSTNAME" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
-    ## WEB_PHP_SOCKET is set
-    go-replace \
-        -s "<PHP_SOCKET>" \
-        -r "$WEB_PHP_SOCKET" \
-        --path=/opt/docker/etc/httpd/ \
-        --path-pattern='*.conf' \
-        --ignore-empty
-else
+if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then
     ## WEB_PHP_SOCKET is not set, remove PHP files
     rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
 fi
diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh
@@ -6,42 +6,16 @@ fi
 
 # Replace markers
 go-replace \
-    -s "<DOCUMENT_INDEX>" \
-    -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_INDEX>" -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_ROOT>" -r "$WEB_DOCUMENT_ROOT" \
+    -s "<ALIAS_DOMAIN>" -r "$WEB_ALIAS_DOMAIN" \
+    -s "<SERVERNAME>" -r "$HOSTNAME" \
+    -s "<PHP_SOCKET>" -r "$WEB_PHP_SOCKET" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
 
-go-replace \
-    -s "<DOCUMENT_ROOT>" \
-    -r "$WEB_DOCUMENT_ROOT" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<ALIAS_DOMAIN>" \
-    -r "$WEB_ALIAS_DOMAIN" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<SERVERNAME>" \
-    -r "$HOSTNAME" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
-    ## WEB_PHP_SOCKET is set
-    go-replace \
-        -s "<PHP_SOCKET>" \
-        -r "$WEB_PHP_SOCKET" \
-        --path=/opt/docker/etc/httpd/ \
-        --path-pattern='*.conf' \
-        --ignore-empty
-else
+if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then
     ## WEB_PHP_SOCKET is not set, remove PHP files
     rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
 fi
diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh
@@ -6,42 +6,16 @@ fi
 
 # Replace markers
 go-replace \
-    -s "<DOCUMENT_INDEX>" \
-    -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_INDEX>" -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_ROOT>" -r "$WEB_DOCUMENT_ROOT" \
+    -s "<ALIAS_DOMAIN>" -r "$WEB_ALIAS_DOMAIN" \
+    -s "<SERVERNAME>" -r "$HOSTNAME" \
+    -s "<PHP_SOCKET>" -r "$WEB_PHP_SOCKET" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
 
-go-replace \
-    -s "<DOCUMENT_ROOT>" \
-    -r "$WEB_DOCUMENT_ROOT" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<ALIAS_DOMAIN>" \
-    -r "$WEB_ALIAS_DOMAIN" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<SERVERNAME>" \
-    -r "$HOSTNAME" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
-    ## WEB_PHP_SOCKET is set
-    go-replace \
-        -s "<PHP_SOCKET>" \
-        -r "$WEB_PHP_SOCKET" \
-        --path=/opt/docker/etc/httpd/ \
-        --path-pattern='*.conf' \
-        --ignore-empty
-else
+if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then
     ## WEB_PHP_SOCKET is not set, remove PHP files
     rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
 fi
diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh
@@ -6,42 +6,16 @@ fi
 
 # Replace markers
 go-replace \
-    -s "<DOCUMENT_INDEX>" \
-    -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_INDEX>" -r "$WEB_DOCUMENT_INDEX" \
+    -s "<DOCUMENT_ROOT>" -r "$WEB_DOCUMENT_ROOT" \
+    -s "<ALIAS_DOMAIN>" -r "$WEB_ALIAS_DOMAIN" \
+    -s "<SERVERNAME>" -r "$HOSTNAME" \
+    -s "<PHP_SOCKET>" -r "$WEB_PHP_SOCKET" \
     --path=/opt/docker/etc/httpd/ \
     --path-pattern='*.conf' \
     --ignore-empty
 
-go-replace \
-    -s "<DOCUMENT_ROOT>" \
-    -r "$WEB_DOCUMENT_ROOT" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<ALIAS_DOMAIN>" \
-    -r "$WEB_ALIAS_DOMAIN" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-go-replace \
-    -s "<SERVERNAME>" \
-    -r "$HOSTNAME" \
-    --path=/opt/docker/etc/httpd/ \
-    --path-pattern='*.conf' \
-    --ignore-empty
-
-if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then
-    ## WEB_PHP_SOCKET is set
-    go-replace \
-        -s "<PHP_SOCKET>" \
-        -r "$WEB_PHP_SOCKET" \
-        --path=/opt/docker/etc/httpd/ \
-        --path-pattern='*.conf' \
-        --ignore-empty
-else
+if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then
     ## WEB_PHP_SOCKET is not set, remove PHP files
     rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
 fi