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

Move off tty7, which is used by upstart

Browse Source
This commit is contained in:
Ian Gulliver
2016-04-07 20:48:32 +00:00
parent eb2a56d8e2
commit 79961af5c2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/autoimage.py
View File

@@ -114,12 +114,12 @@ description "AutoImage"
start on runlevel [2345] start on runlevel [2345]
script script
exec </dev/tty7 >/dev/tty7 2>&1 exec </dev/tty8 >/dev/tty8 2>&1
chvt 7 chvt 8
/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 7 chvt 8
/icon/iconograph/imager/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/icon/config/ca.image.cert.pem --base-url=%(base_url)s %(image_flags)s /icon/iconograph/imager/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/icon/config/ca.image.cert.pem --base-url=%(base_url)s %(image_flags)s
chvt 7 chvt 8
echo echo
echo "==================" echo "=================="

10
server/modules/certclient.py
View File

@@ -103,8 +103,8 @@ description "CertClient %(tag)s"
start on systemid-ready start on systemid-ready
script script
exec </dev/tty8 >/dev/tty8 2>&1 exec </dev/tty9 >/dev/tty9 2>&1
chvt 8 chvt 9
KEY="/systemid/$(hostname).%(tag)s.key.pem" KEY="/systemid/$(hostname).%(tag)s.key.pem"
CERT="/systemid/$(hostname).%(tag)s.cert.pem" CERT="/systemid/$(hostname).%(tag)s.cert.pem"
@@ -115,16 +115,16 @@ script
chmod 0400 "${KEY}" chmod 0400 "${KEY}"
fi fi
chvt 8 chvt 9
/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 9
if test ! -s "${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
chvt 8 chvt 9
echo echo
echo "==================" echo "=================="