From 53bee19a99389e06f53edb7491083d616d5aa5e6 Mon Sep 17 00:00:00 2001 From: Lord Anton Hvornum Date: Fri, 13 Apr 2018 06:54:22 +0200 Subject: More debugging --- archinstall.py | 7 ++++++- deployments/08:00:27:6f:0c:25.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/archinstall.py b/archinstall.py index 5929de13..1966ea6e 100644 --- a/archinstall.py +++ b/archinstall.py @@ -45,7 +45,8 @@ def get_local_MACs(): def run(cmd, echo=False, opts=None, *args, **kwargs): if not opts: opts = {} - #print('[!] {}'.format(cmd)) + if echo or 'debug' in opts: + print('[!] {}'.format(cmd)) handle = Popen(cmd, shell='True', stdout=PIPE, stderr=STDOUT, **kwargs) output = b'' while handle.poll() is None: @@ -334,3 +335,7 @@ if __name__ == '__main__': o = run('reboot now') else: print('Done. "umount -R /mnt; reboot" when you\'re done tinkering.') + + + +'su - postgres -c "psql -c \'CREATE USER pdns WITH PASSWORD \\\'SomePassword\\\';\'"' diff --git a/deployments/08:00:27:6f:0c:25.json b/deployments/08:00:27:6f:0c:25.json index 780f8466..313a2c83 100644 --- a/deployments/08:00:27:6f:0c:25.json +++ b/deployments/08:00:27:6f:0c:25.json @@ -11,7 +11,7 @@ "sh -c \"echo 'postgres:{pin}' | chpasswd\"" : null, "su - postgres -c \"initdb --locale $LANG -E UTF8 -D '/var/lib/postgres/data'\"" : null, "systemctl start postgresql" : null, - "su - postgres -c \"psql -c 'CREATE USER pdns WITH PASSWORD \\\'SomePassword\\\';'\"" : {"debug" : true} + "su - postgres -c \"psql -c \\\"CREATE USER pdns WITH PASSWORD 'SomePassword';\\\"" : {"debug" : true} }, "Setup DNS": { "sh -c \"echo -e 'launch=gpgsql\ngpgsql-host=127.0.0.1\ngpgsql-user=pdns\ngpgsql-dbname=pdns\ngpgsql-password={PIN}' >> /etc/powerdns/pdns.conf\"" : null, -- cgit v1.2.3-70-g09d2