D3681.diff
No OneTemporary
Actions

Size

20 KB

Referenced Files

None

Subscribers

None

D3681.diff
View Options

	diff --git a/roles/core/certificates/files/acmesh-nginxCheck.sh b/roles/core/certificates/files/acmesh-nginxCheck.sh
	--- a/roles/core/certificates/files/acmesh-nginxCheck.sh
	+++ b/roles/core/certificates/files/acmesh-nginxCheck.sh
	@@ -16,14 +16,14 @@
	# </auto-generated>

	nginx_test() {
	- nginx_output="$(nginx -t 2>&1)"
	- nginx_return_code="$?"
	+ nginx_output="$(nginx -t 2>&1)"
	+ nginx_return_code="$?"

	- if [ "$nginx_return_code" -eq 0 ] && echo "${nginx_output}" \| grep warn >&2; then
	- return 2;
	- else
	- return "$nginx_return_code";
	- fi;
	+ if [ "$nginx_return_code" -eq 0 ] && echo "${nginx_output}" \| grep warn >&2; then
	+ return 2;
	+ else
	+ return "$nginx_return_code";
	+ fi;
	}

	nginx_test && nginx -s reload
	diff --git a/roles/core/certificates/files/letsencrypt-renewal.sh b/roles/core/certificates/files/letsencrypt-renewal.sh
	--- a/roles/core/certificates/files/letsencrypt-renewal.sh
	+++ b/roles/core/certificates/files/letsencrypt-renewal.sh
	@@ -16,14 +16,14 @@
	# </auto-generated>

	nginx_test() {
	- nginx_output="$(nginx -t 2>&1)"
	- nginx_return_code="$?"
	+ nginx_output="$(nginx -t 2>&1)"
	+ nginx_return_code="$?"

	- if [ "$nginx_return_code" -eq 0 ] && echo "${nginx_output}" \| grep warn >&2; then
	- return 2;
	- else
	- return "$nginx_return_code";
	- fi;
	+ if [ "$nginx_return_code" -eq 0 ] && echo "${nginx_output}" \| grep warn >&2; then
	+ return 2;
	+ else
	+ return "$nginx_return_code";
	+ fi;
	}

	certbot renew && nginx_test && nginx -s reload
	diff --git a/roles/core/motd/files/motd.sh b/roles/core/motd/files/motd.sh
	--- a/roles/core/motd/files/motd.sh
	+++ b/roles/core/motd/files/motd.sh
	@@ -17,7 +17,7 @@
	# </auto-generated>

	if [ -f /etc/motd ]; then
	- cat /etc/motd
	+ cat /etc/motd
	else
	- echo "No MOTD."
	+ echo "No MOTD."
	fi
	diff --git a/roles/core/network/files/Linux/routes.sh b/roles/core/network/files/Linux/routes.sh
	--- a/roles/core/network/files/Linux/routes.sh
	+++ b/roles/core/network/files/Linux/routes.sh
	@@ -22,14 +22,14 @@
	# Runs as root only
	test -z $UID && UID=$(id -u)
	if [ "$UID" -ne 0 ]; then
	- echo This script must be run as root. >&2
	- exit 1
	+ echo This script must be run as root. >&2
	+ exit 1
	fi

	# Warn about configuration missing
	if [ ! -f $ROUTES_CONFIG_PATH ]; then
	- echo No routes configuration file found at $ROUTES_CONFIG_PATH >&2
	- exit 2
	+ echo No routes configuration file found at $ROUTES_CONFIG_PATH >&2
	+ exit 2
	fi

	# Apply routes
	diff --git a/roles/mailserver/dkim/files/bin/get-dkim-dns-entries.sh b/roles/mailserver/dkim/files/bin/get-dkim-dns-entries.sh
	--- a/roles/mailserver/dkim/files/bin/get-dkim-dns-entries.sh
	+++ b/roles/mailserver/dkim/files/bin/get-dkim-dns-entries.sh
	@@ -19,8 +19,8 @@
	# Parses arguments
	if [ $# -eq 0 ]
	then
	- echo "Usage: $(basename "$0") <domain>"
	- exit 1
	+ echo "Usage: $(basename "$0") <domain>"
	+ exit 1
	fi

	DOMAIN=$1
	@@ -28,11 +28,11 @@

	if [ ! -d "$DIR" ]
	then
	- echo "Directory not found: $DIR"
	- exit 2
	+ echo "Directory not found: $DIR"
	+ exit 2
	fi

	for f in "$DIR"/*.txt
	do
	- get-dkim-dns-entry "$f"
	+ get-dkim-dns-entry "$f"
	done
	diff --git a/roles/mailserver/dkim/files/bin/get-dkim-key-table.sh b/roles/mailserver/dkim/files/bin/get-dkim-key-table.sh
	--- a/roles/mailserver/dkim/files/bin/get-dkim-key-table.sh
	+++ b/roles/mailserver/dkim/files/bin/get-dkim-key-table.sh
	@@ -18,11 +18,11 @@

	for d in /usr/local/etc/opendkim/keys/*
	do
	- DOMAIN=$(basename "$d")
	+ DOMAIN=$(basename "$d")

	- for f in "$d"/*.private
	- do
	- SELECTOR=$(basename "$f" .private)
	- echo "$SELECTOR._domainkey.$DOMAIN $DOMAIN:$SELECTOR:$f"
	- done
	+ for f in "$d"/*.private
	+ do
	+ SELECTOR=$(basename "$f" .private)
	+ echo "$SELECTOR._domainkey.$DOMAIN $DOMAIN:$SELECTOR:$f"
	+ done
	done
	diff --git a/roles/mailserver/dkim/files/bin/get-dkim-signing-table.sh b/roles/mailserver/dkim/files/bin/get-dkim-signing-table.sh
	--- a/roles/mailserver/dkim/files/bin/get-dkim-signing-table.sh
	+++ b/roles/mailserver/dkim/files/bin/get-dkim-signing-table.sh
	@@ -18,11 +18,11 @@

	for d in /usr/local/etc/opendkim/keys/*
	do
	- DOMAIN=$(basename "$d")
	+ DOMAIN=$(basename "$d")

	- for f in "$d"/*.private
	- do
	- SELECTOR=$(basename "$f" .private)
	- echo "$DOMAIN $SELECTOR._domainkey.$DOMAIN"
	- done
	+ for f in "$d"/*.private
	+ do
	+ SELECTOR=$(basename "$f" .private)
	+ echo "$DOMAIN $SELECTOR._domainkey.$DOMAIN"
	+ done
	done
	diff --git a/roles/paas-docker/devel/files/arc.sh b/roles/paas-docker/devel/files/arc.sh
	--- a/roles/paas-docker/devel/files/arc.sh
	+++ b/roles/paas-docker/devel/files/arc.sh
	@@ -27,10 +27,10 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ -t 0 ]; then
	- # If a stdin entry is available
	- # launch the container in the
	- # interactive mode
	- FLAGS=-it
	+ # If a stdin entry is available
	+ # launch the container in the
	+ # interactive mode
	+ FLAGS=-it
	fi

	# Logs are default disabled
	@@ -39,24 +39,24 @@
	UPDATE_MODE=0

	if [ "$1" = "shell" ]; then
	- # Launch commands
	- # in the container bash shell
	- shift
	- COMMAND=bash
	+ # Launch commands
	+ # in the container bash shell
	+ shift
	+ COMMAND=bash
	elif [ "$1" = "update" ]; then
	- UPDATE_MODE=1
	+ UPDATE_MODE=1
	else
	- # Launch arc
	- mkdir -p ~/.arc
	- COMMAND=arc
	-
	- if [ "$1" = "call-conduit" ]; then
	- # Enable log printing
	- PRINT_LOG=1
	- # Set a random name for the container
	- INSTANCE="arc-"$(openssl rand -hex 21)
	- FLAGS="-i -a=stdin --name=$INSTANCE"
	- fi
	+ # Launch arc
	+ mkdir -p ~/.arc
	+ COMMAND=arc
	+
	+ if [ "$1" = "call-conduit" ]; then
	+ # Enable log printing
	+ PRINT_LOG=1
	+ # Set a random name for the container
	+ INSTANCE="arc-"$(openssl rand -hex 21)
	+ FLAGS="-i -a=stdin --name=$INSTANCE"
	+ fi
	fi

	# -------------------------------------------------------------
	@@ -64,36 +64,36 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	build_user_image () {
	- BUILD_DIR=$(mktemp -d -t arc-build-XXXXXXXXXX)
	- pushd "$BUILD_DIR" > /dev/null \|\| exit 1
	- >&2 echo "🔨 Building user-specific image $IMAGE for $USER"
	- echo "FROM $BASE_IMAGE" > Dockerfile
	- echo "RUN groupadd -r $USER -g $GID && mkdir /home/$USER && useradd -u $UID -r -g $USER -d /home/$USER -s /bin/bash $USER && cp /root/.bashrc /home/$USER/ && chown -R $USER:$USER /home/$USER && ln -s /opt/config/gitconfig /home/$USER/.gitconfig && ln -s /opt/config/arcrc /home/$USER/.arcrc" >> Dockerfile
	- docker build -t "$IMAGE" .
	- popd > /dev/null
	- rm -rf "$BUILD_DIR"
	+ BUILD_DIR=$(mktemp -d -t arc-build-XXXXXXXXXX)
	+ pushd "$BUILD_DIR" > /dev/null \|\| exit 1
	+ >&2 echo "🔨 Building user-specific image $IMAGE for $USER"
	+ echo "FROM $BASE_IMAGE" > Dockerfile
	+ echo "RUN groupadd -r $USER -g $GID && mkdir /home/$USER && useradd -u $UID -r -g $USER -d /home/$USER -s /bin/bash $USER && cp /root/.bashrc /home/$USER/ && chown -R $USER:$USER /home/$USER && ln -s /opt/config/gitconfig /home/$USER/.gitconfig && ln -s /opt/config/arcrc /home/$USER/.arcrc" >> Dockerfile
	+ docker build -t "$IMAGE" .
	+ popd > /dev/null
	+ rm -rf "$BUILD_DIR"
	}

	test -v $UID && UID=$(id -u)
	test -v $GID && GID=$(id -g)

	if [ $UPDATE_MODE -eq 1 ]; then
	- docker pull $BASE_IMAGE
	+ docker pull $BASE_IMAGE

	- # Rebuild user image
	- IMAGE=$BASE_IMAGE:$UID-$GID
	- test $UID -eq 0 \|\| build_user_image
	+ # Rebuild user image
	+ IMAGE=$BASE_IMAGE:$UID-$GID
	+ test $UID -eq 0 \|\| build_user_image

	- exit
	+ exit
	fi

	if [ $UID -eq 0 ]; then
	- IMAGE=$BASE_IMAGE
	- CONTAINER_USER_HOME=/root
	+ IMAGE=$BASE_IMAGE
	+ CONTAINER_USER_HOME=/root
	else
	- IMAGE=$BASE_IMAGE:$UID-$GID
	- test ! -z $(docker images -q "$IMAGE") \|\| build_user_image
	- CONTAINER_USER_HOME="/home/$USER"
	+ IMAGE=$BASE_IMAGE:$UID-$GID
	+ test ! -z $(docker images -q "$IMAGE") \|\| build_user_image
	+ CONTAINER_USER_HOME="/home/$USER"
	fi

	# -------------------------------------------------------------
	@@ -102,16 +102,16 @@


	if [ -d ~/.arc/ssh ]; then
	- VOLUME_SSH="-v $HOME/.arc/ssh:$CONTAINER_USER_HOME/.ssh"
	+ VOLUME_SSH="-v $HOME/.arc/ssh:$CONTAINER_USER_HOME/.ssh"
	else
	- VOLUME_SSH=""
	+ VOLUME_SSH=""
	fi

	if [ $PRINT_LOG -eq 0 ]; then
	- docker run $FLAGS --rm --user $UID:$GID -v ~/.arc:/opt/config -v "$PWD:/opt/workspace" $VOLUME_SSH $IMAGE $COMMAND "$@"
	+ docker run $FLAGS --rm --user $UID:$GID -v ~/.arc:/opt/config -v "$PWD:/opt/workspace" $VOLUME_SSH $IMAGE $COMMAND "$@"
	else
	- docker run $FLAGS --user $UID:$GID -v ~/.arc:/opt/config -v "$PWD:/opt/workspace" $VOLUME_SSH $IMAGE $COMMAND "$@" > /dev/null
	- sleep 3
	- docker logs "$INSTANCE"
	- docker rm "$INSTANCE" >/dev/null
	+ docker run $FLAGS --user $UID:$GID -v ~/.arc:/opt/config -v "$PWD:/opt/workspace" $VOLUME_SSH $IMAGE $COMMAND "$@" > /dev/null
	+ sleep 3
	+ docker logs "$INSTANCE"
	+ docker rm "$INSTANCE" >/dev/null
	fi
	diff --git a/roles/phabricator/arcanist/files/arc.sh b/roles/phabricator/arcanist/files/arc.sh
	--- a/roles/phabricator/arcanist/files/arc.sh
	+++ b/roles/phabricator/arcanist/files/arc.sh
	@@ -24,10 +24,10 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ -t 0 ]; then
	- # If a stdin entry is available
	- # launch the container in the
	- # interactive mode
	- FLAGS=-it
	+ # If a stdin entry is available
	+ # launch the container in the
	+ # interactive mode
	+ FLAGS=-it
	fi

	# Logs are default disabled
	@@ -35,28 +35,28 @@


	if [ "$1" = "shell" ]; then
	- # Launch commands
	- # in the container bash shell
	- shift
	- COMMAND=bash
	+ # Launch commands
	+ # in the container bash shell
	+ shift
	+ COMMAND=bash
	else
	- # Launch arc
	- mkdir -p ~/.arc
	- COMMAND=arc
	+ # Launch arc
	+ mkdir -p ~/.arc
	+ COMMAND=arc

	- if [ "$1" = "call-conduit" ]; then
	- # Enable log printing
	- PRINT_LOG=1
	- # Set a random name for the container
	- INSTANCE="arc-"$(openssl rand -hex 21)
	- FLAGS="-i -a=stdin --name=$INSTANCE"
	- fi
	+ if [ "$1" = "call-conduit" ]; then
	+ # Enable log printing
	+ PRINT_LOG=1
	+ # Set a random name for the container
	+ INSTANCE="arc-"$(openssl rand -hex 21)
	+ FLAGS="-i -a=stdin --name=$INSTANCE"
	+ fi
	fi

	if [ -d ~/.arc/ssh ]; then
	- VOLUME_SSH="-v $HOME/.arc/ssh:/root/.ssh"
	+ VOLUME_SSH="-v $HOME/.arc/ssh:/root/.ssh"
	else
	- VOLUME_SSH=""
	+ VOLUME_SSH=""
	fi

	# -------------------------------------------------------------
	@@ -64,10 +64,10 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ $PRINT_LOG -eq 0 ]; then
	- docker run "$FLAGS" --rm -v ~/.arc:/opt/config -v "$PWD":/opt/workspace "$VOLUME_SSH" nasqueron/arcanist $COMMAND "$@"
	+ docker run "$FLAGS" --rm -v ~/.arc:/opt/config -v "$PWD":/opt/workspace "$VOLUME_SSH" nasqueron/arcanist $COMMAND "$@"
	else
	- docker run "$FLAGS" -v ~/.arc:/opt/config -v "$PWD":/opt/workspace "$VOLUME_SSH" nasqueron/arcanist $COMMAND "$@" > /dev/null
	- sleep 3
	- docker logs "$INSTANCE"
	- docker rm "$INSTANCE" >/dev/null
	+ docker run "$FLAGS" -v ~/.arc:/opt/config -v "$PWD":/opt/workspace "$VOLUME_SSH" nasqueron/arcanist $COMMAND "$@" > /dev/null
	+ sleep 3
	+ docker logs "$INSTANCE"
	+ docker rm "$INSTANCE" >/dev/null
	fi
	diff --git a/roles/phabricator/containers/files/run-devcentral.sh b/roles/phabricator/containers/files/run-devcentral.sh
	--- a/roles/phabricator/containers/files/run-devcentral.sh
	+++ b/roles/phabricator/containers/files/run-devcentral.sh
	@@ -54,9 +54,9 @@

	docker-container-status $INSTANCE_NAME > /dev/null
	if [ "$?" -lt 2 ]; then
	- echo "Container is already running."
	- echo "To force relaunch, try docker stop $INSTANCE_NAME ; docker rm $INSTANCE_NAME ; $0"
	- exit 1
	+ echo "Container is already running."
	+ echo "To force relaunch, try docker stop $INSTANCE_NAME ; docker rm $INSTANCE_NAME ; $0"
	+ exit 1
	fi

	# -------------------------------------------------------------
	@@ -64,19 +64,19 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker run -t -d \
	- --link $MYSQL_INSTANCE:mysql \
	- -v $DATA_DIRECTORY/repo:/var/repo \
	- -v $DATA_DIRECTORY/conf:/opt/phabricator/conf \
	- -p $PORT:80 \
	+ --link $MYSQL_INSTANCE:mysql \
	+ -v $DATA_DIRECTORY/repo:/var/repo \
	+ -v $DATA_DIRECTORY/conf:/opt/phabricator/conf \
	+ -p $PORT:80 \
	-p 5022:5022 \
	- -e PHABRICATOR_URL=$PHABRICATOR_URL \
	- -e PHABRICATOR_TITLE="$PHABRICATOR_TITLE" \
	- -e PHABRICATOR_ALT_FILE_DOMAIN="$PHABRICATOR_ALT_FILE_DOMAIN" \
	- -e PHABRICATOR_PROD_REPO=$PHABRICATOR_PROD_REPO \
	- -e PHABRICATOR_PROD_BRANCH=$PHABRICATOR_PROD_BRANCH \
	- -e PHABRICATOR_USE_MAILGUN=1 \
	- -e PHABRICATOR_DOMAIN=$DOMAIN \
	- --name $INSTANCE_NAME $IMAGE /usr/local/sbin/runsvdir-init
	+ -e PHABRICATOR_URL=$PHABRICATOR_URL \
	+ -e PHABRICATOR_TITLE="$PHABRICATOR_TITLE" \
	+ -e PHABRICATOR_ALT_FILE_DOMAIN="$PHABRICATOR_ALT_FILE_DOMAIN" \
	+ -e PHABRICATOR_PROD_REPO=$PHABRICATOR_PROD_REPO \
	+ -e PHABRICATOR_PROD_BRANCH=$PHABRICATOR_PROD_BRANCH \
	+ -e PHABRICATOR_USE_MAILGUN=1 \
	+ -e PHABRICATOR_DOMAIN=$DOMAIN \
	+ --name $INSTANCE_NAME $IMAGE /usr/local/sbin/runsvdir-init

	# -------------------------------------------------------------
	# DevCentral specific branch deployment
	@@ -88,13 +88,13 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker exec $INSTANCE_NAME sh -c 'mkdir -p /root/.ssh && \
	- cp /opt/phabricator/conf/deploy-keys/* /root/.ssh'
	+ cp /opt/phabricator/conf/deploy-keys/* /root/.ssh'
	docker exec $INSTANCE_NAME ssh -o StrictHostKeyChecking=no ${REPO_LOGIN}@${REPO_HOST}
	docker exec $INSTANCE_NAME sh -c 'cd /opt/phabricator && \
	- git remote add private "$PHABRICATOR_PROD_REPO" && \
	- git fetch --all && \
	- git checkout $PHABRICATOR_PROD_BRANCH && \
	- sv restart php-fpm && sv restart phd'
	+ git remote add private "$PHABRICATOR_PROD_REPO" && \
	+ git fetch --all && \
	+ git checkout $PHABRICATOR_PROD_BRANCH && \
	+ sv restart php-fpm && sv restart phd'

	echo "Deployment done at $(date)."
	exit 0
	diff --git a/roles/shellserver/user-session/files/whom-diff.sh b/roles/shellserver/user-session/files/whom-diff.sh
	--- a/roles/shellserver/user-session/files/whom-diff.sh
	+++ b/roles/shellserver/user-session/files/whom-diff.sh
	@@ -23,7 +23,7 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ "$SESSION_ID" = "" ]; then
	- SESSION_ID=$(who am I \| md5 \| cut -c1-8)
	+ SESSION_ID=$(who am I \| md5 \| cut -c1-8)
	fi

	DIR=/var/tmp/whom/$USER/$SESSION_ID
	@@ -34,8 +34,8 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ "$1" = "--session" ] \|\| [ "$1" = "-s" ]; then
	- echo "$SESSION_ID"
	- exit 0
	+ echo "$SESSION_ID"
	+ exit 0
	fi

	# -------------------------------------------------------------
	@@ -44,19 +44,19 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ $# -eq 0 ]; then
	- # Creates working directory if needed
	- if [ ! -d "$DIR" ]; then
	- mkdir -p "$DIR"
	- touch "$DIR"/old
	- fi
	+ # Creates working directory if needed
	+ if [ ! -d "$DIR" ]; then
	+ mkdir -p "$DIR"
	+ touch "$DIR"/old
	+ fi

	- # Let's diff
	- cd "$DIR" \|\| exit
	- whom > current
	- diff old current \| tail -n +2
	- mv current old
	+ # Let's diff
	+ cd "$DIR" \|\| exit
	+ whom > current
	+ diff old current \| tail -n +2
	+ mv current old

	- exit 0
	+ exit 0
	fi

	# -------------------------------------------------------------
	@@ -65,8 +65,8 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ "$1" = "--clean" ] \|\| [ "$1" = "-c" ]; then
	- rm -rf "$DIR"
	- exit $?
	+ rm -rf "$DIR"
	+ exit $?
	fi

	# -------------------------------------------------------------
	diff --git a/roles/shellserver/userland-software/files/install-eggdrop.sh b/roles/shellserver/userland-software/files/install-eggdrop.sh
	--- a/roles/shellserver/userland-software/files/install-eggdrop.sh
	+++ b/roles/shellserver/userland-software/files/install-eggdrop.sh
	@@ -40,13 +40,13 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	if [ -f /etc/debian_version ]; then
	- ARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
	- CFLAGS="-std=gnu99" ./configure --with-tclinc=/usr/include/tcl${TCL_VERSION}/tcl.h --with-tcllib="/usr/lib/$ARCH/libtcl${TCL_VERSION}.so"
	+ ARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
	+ CFLAGS="-std=gnu99" ./configure --with-tclinc=/usr/include/tcl${TCL_VERSION}/tcl.h --with-tcllib="/usr/lib/$ARCH/libtcl${TCL_VERSION}.so"
	elif [ "$(uname)" = "FreeBSD" ]; then
	- TCL_VERSION_LIB=$(echo $TCL_VERSION \| tr -d .)
	- ./configure --with-tclinc=/usr/local/include/tcl${TCL_VERSION}/tcl.h -with-tcllib="/usr/local/lib/libtcl${TCL_VERSION_LIB}.so"
	+ TCL_VERSION_LIB=$(echo $TCL_VERSION \| tr -d .)
	+ ./configure --with-tclinc=/usr/local/include/tcl${TCL_VERSION}/tcl.h -with-tcllib="/usr/local/lib/libtcl${TCL_VERSION_LIB}.so"
	else
	- ./configure
	+ ./configure
	fi

	# -------------------------------------------------------------
	diff --git a/roles/shellserver/vhosts/files/vhosts.sh b/roles/shellserver/vhosts/files/vhosts.sh
	--- a/roles/shellserver/vhosts/files/vhosts.sh
	+++ b/roles/shellserver/vhosts/files/vhosts.sh
	@@ -17,7 +17,7 @@
	# </auto-generated>

	if [ -f /etc/vhosts ]; then
	- cat /etc/vhosts
	+ cat /etc/vhosts
	else
	- echo "No vhosts data file found. Please create /etc/vhosts file."
	+ echo "No vhosts data file found. Please create /etc/vhosts file."
	fi
	diff --git a/roles/vault/bootstrap/files/vault-initialize.sh b/roles/vault/bootstrap/files/vault-initialize.sh
	--- a/roles/vault/bootstrap/files/vault-initialize.sh
	+++ b/roles/vault/bootstrap/files/vault-initialize.sh
	@@ -52,12 +52,12 @@
	vault secrets tune -max-lease-ttl=87600h

	vault write -field=certificate $CA_ROOT_PATH/root/generate/internal \
	- common_name=$DOMAIN \
	- ttl=87600h > $CERTS_PATH/nasqueron-vault-ca.crt
	+ common_name=$DOMAIN \
	+ ttl=87600h > $CERTS_PATH/nasqueron-vault-ca.crt

	vault write $CA_ROOT_PATH/config/urls \
	- issuing_certificates="$PUBLIC_URL/$CA_ROOT_NAME/ca" \
	- crl_distribution_points="$PUBLIC_URL/$CA_ROOT_NAME/crl"
	+ issuing_certificates="$PUBLIC_URL/$CA_ROOT_NAME/ca" \
	+ crl_distribution_points="$PUBLIC_URL/$CA_ROOT_NAME/crl"


	# -------------------------------------------------------------
	@@ -74,24 +74,24 @@

	CSR=$(mktemp /tmp/csr.XXXX)
	vault write -format=json $CA_VAULT_PATH/intermediate/generate/internal \
	- common_name="$DOMAIN Intermediate Authority" \
	- \| jq -r '.data.csr' > "$CSR"
	+ common_name="$DOMAIN Intermediate Authority" \
	+ \| jq -r '.data.csr' > "$CSR"
	vault write -format=json $CA_ROOT_PATH/root/sign-intermediate csr=@"$CSR" \
	- format=pem_bundle ttl="2160h" \
	- \| jq -r '.data.certificate' > $CERTS_PATH/nasqueron-vault-intermediate.crt
	+ format=pem_bundle ttl="2160h" \
	+ \| jq -r '.data.certificate' > $CERTS_PATH/nasqueron-vault-intermediate.crt
	rm "$CSR"

	vault write $CA_VAULT_PATH/intermediate/set-signed \
	- certificate=@$CERTS_PATH/nasqueron-vault-intermediate.crt
	+ certificate=@$CERTS_PATH/nasqueron-vault-intermediate.crt

	vault write $CA_VAULT_PATH/config/urls \
	- issuing_certificates="$PUBLIC_URL/$CA_VAULT_NAME/ca" \
	- crl_distribution_points="$PUBLIC_URL/$CA_VAULT_NAME/crl"
	+ issuing_certificates="$PUBLIC_URL/$CA_VAULT_NAME/ca" \
	+ crl_distribution_points="$PUBLIC_URL/$CA_VAULT_NAME/crl"

	vault write $CA_VAULT_PATH/roles/nasqueron-drake \
	- allowed_domains="nasqueron.drake" \
	- allow_subdomains=true \
	- max_ttl="2160h"
	+ allowed_domains="nasqueron.drake" \
	+ allow_subdomains=true \
	+ max_ttl="2160h"

	# -------------------------------------------------------------
	# Vault configuration artifacts
	@@ -102,10 +102,10 @@
	mkdir -p $VAULT_CERTS_PATH

	vault write -format=json $CA_VAULT_PATH/issue/nasqueron-drake \
	- common_name="complector.nasqueron.drake" ttl="2160h" \
	- ip_sans="127.0.0.1,172.27.27.7" \| tee \
	- >(jq -r .data.certificate > $VAULT_CERTS_PATH/certificate.pem) \
	- >(jq -r .data.issuing_ca > $VAULT_CERTS_PATH/ca.pem) \
	- >(jq -r .data.private_key > $VAULT_CERTS_PATH/private.key)
	+ common_name="complector.nasqueron.drake" ttl="2160h" \
	+ ip_sans="127.0.0.1,172.27.27.7" \| tee \
	+ >(jq -r .data.certificate > $VAULT_CERTS_PATH/certificate.pem) \
	+ >(jq -r .data.issuing_ca > $VAULT_CERTS_PATH/ca.pem) \
	+ >(jq -r .data.private_key > $VAULT_CERTS_PATH/private.key)

	cat $VAULT_CERTS_PATH/certificate.pem $VAULT_CERTS_PATH/ca.pem > $VAULT_CERTS_PATH/fullchain.pem
	diff --git a/roles/webserver-content/org/nasqueron/files/recipes/admin.mail.nasqueron.org/update.sh b/roles/webserver-content/org/nasqueron/files/recipes/admin.mail.nasqueron.org/update.sh
	--- a/roles/webserver-content/org/nasqueron/files/recipes/admin.mail.nasqueron.org/update.sh
	+++ b/roles/webserver-content/org/nasqueron/files/recipes/admin.mail.nasqueron.org/update.sh
	@@ -27,8 +27,8 @@
	CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

	if [ "$CURRENT_BRANCH" != "production" ]; then
	- echo "Code isn't in the production branch." >&2
	- exit 1
	+ echo "Code isn't in the production branch." >&2
	+ exit 1
	fi

	git fetch --all

File Metadata

Mime Type: text/plain
Expires: Wed, Sep 17, 19:03 (19 h, 55 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2989919
Default Alt Text: D3681.diff (20 KB)

D3681.diffNo OneTemporaryActions

D3681.diffView Options

File Metadata

Event Timeline

D3681.diff
No OneTemporary
Actions

D3681.diff
View Options