diff options
| -rwxr-xr-x | src/flufigut.py | 2 | ||||
| -rw-r--r-- | src/test.json | 1 | ||||
| -rw-r--r-- | templates/example/planet.xml | 2 |
3 files changed, 2 insertions, 3 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", diff --git a/templates/example/planet.xml b/templates/example/planet.xml index 454b1bb..47a5b11 100644 --- a/templates/example/planet.xml +++ b/templates/example/planet.xml @@ -8,7 +8,7 @@ %% endif %% endfor <component name="manager-bouncer" type="htpasswdcrypt-bouncer"> - <property name="filename">{{ globals.passwdfile }}</property> + <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property> </component> </manager> |