File tree Expand file tree Collapse file tree 9 files changed +40
-33
lines changed Expand file tree Collapse file tree 9 files changed +40
-33
lines changed Original file line number Diff line number Diff line change 1
1
#!/usr/bin/with-contenv bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
#======================================================================================================================
4
7
# Add environment variable to S6 environment directory
5
8
#======================================================================================================================
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/with-contenv bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
#======================================================================================================================
4
7
# Check for clean install
5
8
#======================================================================================================================
6
9
7
- if [ ! -f ${SSL_GLOBAL_CFG} ] || [ "${CLEAN_INSTALL}" = "1" ] ; then
8
-
9
- if [ "${CLEAN_INSTALL}" = "1" ] ; then
10
- _echo "Clean install detected, cleaning ${SSL_CERTS} and ${SITES}..."
11
-
12
- if [ -z "${SSL_GLOBAL_CFG}" ] ; then
13
- _error "SSL_GLOBAL_CFG not defined."
14
- exit 1
15
- else
16
- rm -f ${SSL_GLOBAL_CFG}
17
- fi
18
-
19
- if [ -z "${SSL_CERTS}" ] ; then
20
- _error "SSL_CERTS not defined."
21
- exit 1
22
- else
23
- rm -rf ${SSL_CERTS}/*
24
- fi
25
-
26
- if [ -z "${SITES}" ] ; then
27
- _error "SITES not defined."
28
- exit 1
29
- else
30
- rm -rf ${SITES}/*
31
- fi
32
-
33
- _done
34
- fi
35
-
10
+ if [ "${CLEAN_INSTALL}" = "1" ] ; then
11
+
12
+ _echo "Clean install detected, cleaning ${SSL_CERTS} and ${SITES}..."
13
+
14
+ [[ -z "${SSL_GLOBAL_CFG}" ]] && _error "SSL_GLOBAL_CFG not defined."
15
+ rm -rf ${SSL_GLOBAL_CFG}
16
+
17
+ [[ -z "${SSL_CERTS}" ]] && _error "SSL_CERTS not defined."
18
+ rm -rf ${SSL_CERTS}/*
19
+
20
+ [[ -z "${SITES}" ]] && _error "SITES not defined."
21
+ rm -rf ${SITES}/*
22
+
23
+ _done
24
+
36
25
fi
37
26
38
27
Original file line number Diff line number Diff line change 1
- /ssl true www:www 0644 0755
2
- /etc/ssl/certs false www:www 0644 0755
1
+ /ssl true www:www 0640 0750
2
+ /etc/ssl/certs false www:www 0640 0750
Original file line number Diff line number Diff line change 1
- /sites true www:www 0644 0755
2
- /etc/nginx/sites false www:www 0644 0755
1
+ /sites true www:www 0640 0750
2
+ /etc/nginx/sites false www:www 0640 0750
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/with-contenv bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
#======================================================================================================================
4
7
# Delete Nginx configuration files and reinitialise
5
8
#======================================================================================================================
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/with-contenv bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
#======================================================================================================================
4
7
# Run /etc/ssl/init executable
5
8
#======================================================================================================================
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/with-contenv bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
#======================================================================================================================
4
7
# Delete SSL files and reinitialise
5
8
#======================================================================================================================
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
# ======================================================================================================================
4
7
# Run /etc/ssl/request executable
5
8
# ======================================================================================================================
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
+ set -euo pipefail
4
+
5
+
3
6
# ======================================================================================================================
4
7
# Run /etc/ssl/update executable
5
8
# ======================================================================================================================
You can’t perform that action at this time.
0 commit comments