summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcreate6
-rwxr-xr-xscripts/krb2
-rwxr-xr-xscripts/ldap2
-rwxr-xr-xscripts/nfs2
-rwxr-xr-xscripts/roll (renamed from scripts/debian_roll)3
5 files changed, 7 insertions, 8 deletions
diff --git a/create b/create
index e7ff891..5a738f4 100755
--- a/create
+++ b/create
@@ -1,11 +1,11 @@
#!/bin/bash
set -e
-scripts/krb > logs/krb
+scripts/krb > logs/krb 2>logs/krb_err
lxc-info krb
-scripts/nfs > logs/nfs
+scripts/nfs > logs/nfs 2>logs/nfs_err
lxc-info nfs
-scripts/ldap > logs/ldap
+scripts/ldap > logs/ldap 2>logs/ldap_err
lxc-info ldap
diff --git a/scripts/krb b/scripts/krb
index 4df7fef..d5c15a8 100755
--- a/scripts/krb
+++ b/scripts/krb
@@ -7,7 +7,7 @@ KRB5_ADMIN_PASS=pass
USER_PASS=tommie
IP="$(grep krb configs/hosts | cut -d ' ' -f 1)"
-scripts/debian_roll krb
+scripts/roll krb
lxc-attach krb -v DEBIAN_FRONTEND=noninteractive -- apt-get -y install krb5-admin-server
scp configs/krb/krb5.conf root@$IP:/etc/
diff --git a/scripts/ldap b/scripts/ldap
index 594f37b..c545825 100755
--- a/scripts/ldap
+++ b/scripts/ldap
@@ -1,5 +1,5 @@
#!/bin/bash
set -e
-scripts/debian_roll ldap
+scripts/roll ldap
#lxc-attach ldap -v DEBIAN_FRONTEND=noninteractive -- apt-get -y install slapd ldap-utils ldapscripts
diff --git a/scripts/nfs b/scripts/nfs
index 4439eba..8ab7ef4 100755
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -1,4 +1,4 @@
#!/bin/bash
set -e
-scripts/debian_roll nfs
+scripts/roll nfs
diff --git a/scripts/debian_roll b/scripts/roll
index caf652c..d8deb61 100755
--- a/scripts/debian_roll
+++ b/scripts/roll
@@ -15,8 +15,7 @@ sleep 15
# install basics
lxc-attach $NAME -- apt-get update
lxc-attach $NAME -- apt-get dist-upgrade
-lxc-attach $NAME -- apt-get install -y apt-utils
-lxc-attach $NAME -- apt-get install -y sudo openssh-server x11-xserver-utils
+lxc-attach $NAME -- apt-get install -y sudo openssh-server x11-xserver-utils apt-utils
# setup users
lxc-attach $NAME -- bash -c 'echo -e "'$ROOT_PASS'\n'$ROOT_PASS'" | passwd'