File tree Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -61,11 +61,13 @@ if [ ! -f ${config.installDir}/ssl/domain-chain.crt ]; then
61
61
openssl genrsa -passout pass:x -out ${config.installDir}/ssl/server.pass.key 2048
62
62
openssl rsa -passin pass:x -in ${config.installDir}/ssl/server.pass.key -out ${config.installDir}/ssl/domain.key
63
63
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"
65
65
openssl x509 -req -days 358000 -in ${config.installDir}/ssl/domain.csr -signkey ${config.installDir}/ssl/domain.key -out ${config.installDir}/ssl/domain-chain.crt
66
66
rm ${config.installDir}/ssl/domain.csr
67
67
fi
68
68
69
+ cp ${config.installDir}/etc/r2cloud.conf /etc/nginx/sites-enabled/r2cloud.conf;
70
+
69
71
# ignore status code, because r2cloud might not be the only default server
70
72
if [ -f /run/nginx.pid ]; then
71
73
nginx -s reload || true
Original file line number Diff line number Diff line change @@ -10,6 +10,10 @@ if [ -d /run/systemd/system ]; then
10
10
systemctl --system daemon-reload >/dev/null || true
11
11
fi
12
12
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
+
13
17
if [ -f /run/nginx.pid ]; then
14
18
nginx -s reload || true
15
19
fi
File renamed without changes.
You can’t perform that action at this time.
0 commit comments