Skip to content

Commit b721877

Browse files
install nginx service only after certificates generated
cleanup certificates and configs when removing r2cloud
1 parent 37db0fb commit b721877

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/main/deb/postinst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ if [ ! -f ${config.installDir}/ssl/domain-chain.crt ]; then
6161
openssl genrsa -passout pass:x -out ${config.installDir}/ssl/server.pass.key 2048
6262
openssl rsa -passin pass:x -in ${config.installDir}/ssl/server.pass.key -out ${config.installDir}/ssl/domain.key
6363
rm ${config.installDir}/ssl/server.pass.key
64-
openssl req -new -key ${config.installDir}/ssl/domain.key -out ${config.installDir}/ssl/domain.csr -subj "/C=RU/ST=Moscow/L=Moscow/O=r2cloud/OU=r2cloud/CN=raspberrypi.local"
64+
openssl req -new -key ${config.installDir}/ssl/domain.key -out ${config.installDir}/ssl/domain.csr -subj "/C=RU/ST=Moscow/L=Moscow/O=r2cloud/OU=r2cloud/CN=$(hostname).local"
6565
openssl x509 -req -days 358000 -in ${config.installDir}/ssl/domain.csr -signkey ${config.installDir}/ssl/domain.key -out ${config.installDir}/ssl/domain-chain.crt
6666
rm ${config.installDir}/ssl/domain.csr
6767
fi
6868

69+
cp ${config.installDir}/etc/r2cloud.conf /etc/nginx/sites-enabled/r2cloud.conf;
70+
6971
# ignore status code, because r2cloud might not be the only default server
7072
if [ -f /run/nginx.pid ]; then
7173
nginx -s reload || true

src/main/deb/postrm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ if [ -d /run/systemd/system ]; then
1010
systemctl --system daemon-reload >/dev/null || true
1111
fi
1212

13+
rm -f /etc/nginx/sites-enabled/r2cloud.conf
14+
rm -f ${config.installDir}/ssl/domain-chain.crt
15+
rm -f ${config.installDir}/ssl/domain.key
16+
1317
if [ -f /run/nginx.pid ]; then
1418
nginx -s reload || true
1519
fi
File renamed without changes.

0 commit comments

Comments
 (0)