summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2012-10-12 23:57:58 +0200
committerChristian Pointner <equinox@spreadspace.org>2012-10-12 23:57:58 +0200
commit419da2990c0291f51391be39d5150993e9a2d28b (patch)
treeaec242171f1156fdfe7848f12ed964d9c8a67539 /src
parentadd password generator for admin user (diff)
better handling for passwd file
Diffstat (limited to 'src')
-rwxr-xr-xsrc/flufigut.py2
-rw-r--r--src/test.json1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/flufigut.py b/src/flufigut.py
index a1db47f..5d14dd8 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -337,7 +337,7 @@ f.write(planet.encode("utf8"))
f.write('\n')
f.close()
-passwd = open('output/%s/passwd' % globals['manager']['machine'], 'w')
+passwd = open('output/%s/%s.passwd' % (globals['manager']['machine'], globals['name']), 'w')
port = 9000
for w in worker:
diff --git a/src/test.json b/src/test.json
index 48fcc18..59e8334 100644
--- a/src/test.json
+++ b/src/test.json
@@ -4,7 +4,6 @@
"name": "elevate-live",
"description": "Live from Elevate Festival 2012",
"domain": "spreadspace.org",
- "passwdfile": "/etc/flumotion/passwd",
"rrd-dir": "/var/lib/flumotion/rrd",
"manager": {
"machine": "titan",