Skip to content

Commit 7c9adf1

Browse files
Merge #119
119: vm-sysroot: set the JJS_SELF_ADDR environment variable r=MikailBag a=sleirsgoevy Co-authored-by: Sergey Lisov <[email protected]>
2 parents 7886fce + 2e75a11 commit 7c9adf1

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

vm-sysroot/env.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export JJS_SYSROOT=/var/lib/jjs
2+
export JJS_PATH=/usr
3+
export DATABASE_URL=postgres://jjs:internal@localhost:5432/jjs
4+
export RUST_BACKTRACE=1
5+
export JJS_HOST=0.0.0.0
6+
export JJS_SELF_ADDR=127.0.0.1

vm-sysroot/scripts/post-sysroot/init.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ sleep 5
3131
echo "We are: \$(id)"
3232
3333
su jjs -c '
34-
export JJS_SYSROOT=/var/lib/jjs
35-
export JJS_PATH=/usr
36-
export DATABASE_URL=postgres://jjs:internal@localhost:5432/jjs
37-
export RUST_BACKTRACE=1
38-
export JJS_HOST=0.0.0.0
34+
$(cat env.txt)
3935
jjs-frontend &
4036
'
4137
42-
export JJS_SYSROOT=/var/lib/jjs
43-
export JJS_PATH=/usr
44-
export DATABASE_URL=postgres://jjs:internal@localhost:5432/jjs
45-
export RUST_BACKTRACE=1
38+
$(cat env.txt)
4639
jjs-invoker &
4740
4841
ifdown eth0

0 commit comments

Comments
 (0)