x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ignore zero-sized files

Browse Source
This commit is contained in:
Ian Gulliver
2016-04-07 20:29:48 +00:00
parent 63b0e393f7
commit 22e072c19f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/certclient.py
View File

@@ -110,7 +110,7 @@ script
CERT="/systemid/$(hostname).%(tag)s.cert.pem" CERT="/systemid/$(hostname).%(tag)s.cert.pem"
SUBJECT="$(echo '%(subject)s' | sed s/SYSTEMID/$(hostname)/g)" SUBJECT="$(echo '%(subject)s' | sed s/SYSTEMID/$(hostname)/g)"
if test ! -e "${KEY}"; then if test ! -s "${KEY}"; then
openssl ecparam -name secp384r1 -genkey | openssl ec -out "${KEY}" openssl ecparam -name secp384r1 -genkey | openssl ec -out "${KEY}"
chmod 0400 "${KEY}" chmod 0400 "${KEY}"
fi fi
@@ -119,7 +119,7 @@ script
/icon/iconograph/client/wait_for_service.py --host=%(host)s --service=%(service)s /icon/iconograph/client/wait_for_service.py --host=%(host)s --service=%(service)s
chvt 8 chvt 8
if test ! -e "${CERT}"; then if test ! -s "${CERT}"; then
openssl req -new -key "${KEY}" -subj "${SUBJECT}" | /icon/certserver/certclient.py --ca-cert=/icon/config/ca.%(tag)s.certserver.cert.pem --client-cert=/icon/config/client.%(tag)s.certserver.cert.pem --client-key=/icon/config/client.%(tag)s.certserver.key.pem --server=%(server)s > "${CERT}" openssl req -new -key "${KEY}" -subj "${SUBJECT}" | /icon/certserver/certclient.py --ca-cert=/icon/config/ca.%(tag)s.certserver.cert.pem --client-cert=/icon/config/client.%(tag)s.certserver.cert.pem --client-key=/icon/config/client.%(tag)s.certserver.key.pem --server=%(server)s > "${CERT}"
chmod 0444 "${CERT}" chmod 0444 "${CERT}"
fi fi