Skip to content

Commit e5de202

Browse files
author
vdelendik
committed
moved ssl crt and key outside of source control
1 parent e0480ad commit e5de202

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ backup/settings.env
66
variables.env
77
configuration/stf-proxy/nginx.conf
88
configuration/stf-proxy/htpasswd/mcloud.htpasswd
9+
configuration/stf-proxy/ssl/ssl.crt
10+
configuration/stf-proxy/ssl/ssl.key
File renamed without changes.
File renamed without changes.

zebrunner.sh

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,17 @@
3737

3838
# uncomment default ssl settings
3939
replace configuration/stf-proxy/nginx.conf "# ssl_" " ssl_"
40-
fi
4140

41+
#136 made ssl.crt and ssl.key not under source control
42+
if [[ ! -f configuration/stf-proxy/ssl/ssl.crt ]]; then
43+
echo "using self-signed certificate..."
44+
cp configuration/stf-proxy/ssl/ssl.crt.original configuration/stf-proxy/ssl/ssl.crt
45+
fi
46+
if [[ ! -f configuration/stf-proxy/ssl/ssl.key ]]; then
47+
echo "using self-signed key..."
48+
cp configuration/stf-proxy/ssl/ssl.key.original configuration/stf-proxy/ssl/ssl.key
49+
fi
50+
fi
4251

4352
# export all ZBR* variables to save user input
4453
export_settings
@@ -104,6 +113,13 @@
104113
cp configuration/stf-proxy/nginx.conf configuration/stf-proxy/nginx.conf.bak
105114
cp configuration/stf-proxy/htpasswd/mcloud.htpasswd configuration/stf-proxy/htpasswd/mcloud.htpasswd.bak
106115

116+
if [[ -f configuration/stf-proxy/ssl/ssl.crt ]]; then
117+
cp configuration/stf-proxy/ssl/ssl.crt configuration/stf-proxy/ssl/ssl.crt.bak
118+
fi
119+
if [[ -f configuration/stf-proxy/ssl/ssl.key ]]; then
120+
cp configuration/stf-proxy/ssl/ssl.key configuration/stf-proxy/ssl/ssl.key.bak
121+
fi
122+
107123
docker run --rm --volumes-from rethinkdb -v "$(pwd)"/backup:/var/backup "ubuntu" tar -czvf /var/backup/rethinkdb.tar.gz /data
108124
}
109125

@@ -119,6 +135,13 @@
119135
cp configuration/stf-proxy/nginx.conf.bak configuration/stf-proxy/nginx.conf
120136
cp configuration/stf-proxy/htpasswd/mcloud.htpasswd.bak configuration/stf-proxy/htpasswd/mcloud.htpasswd
121137

138+
if [[ -f configuration/stf-proxy/ssl/ssl.crt.bak ]]; then
139+
cp configuration/stf-proxy/ssl/ssl.crt.bak configuration/stf-proxy/ssl/ssl.crt
140+
fi
141+
if [[ -f configuration/stf-proxy/ssl/ssl.key.bak ]]; then
142+
cp configuration/stf-proxy/ssl/ssl.key.bak configuration/stf-proxy/ssl/ssl.key
143+
fi
144+
122145
docker run --rm --volumes-from rethinkdb -v "$(pwd)"/backup:/var/backup "ubuntu" bash -c "cd / && tar -xzvf /var/backup/rethinkdb.tar.gz"
123146
down
124147
}

0 commit comments

Comments
 (0)