summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config.php10
-rw-r--r--ipe.ks14
2 files changed, 13 insertions, 11 deletions
diff --git a/config.php b/config.php
index eb80538..7fbfd71 100644
--- a/config.php
+++ b/config.php
@@ -7,7 +7,7 @@ $DISTRIBUTIONS=array("centos7", "centos8", "fedora");
$SERVERS = array(
"templates" => "templates",
- "sysdisks" => "sdb,sdc",
+ "sysdisks" => "sda,sdb",
"eth" => array("eno1", "eno2"),
"domain" => "ipe.kit.edu",
"cidr" => 23,
@@ -27,6 +27,7 @@ $SERVERS = array(
$KATRIN_SERVERS = array_merge($SERVERS, array(
"ks" => "ipekatrin-v4.ks",
+ "sysdisks" => "sdb,sdc",
"eth" => array("enp3s0f1", "enp3s0f0"),
));
@@ -53,7 +54,6 @@ $COMPUTE_SERVERS = array_merge($IPE_SERVERS, array(
$CAMERA_SERVERS = array_merge($IPE_SERVERS, array(
"base_ip" => 80,
- "sysdisks" => "sda,sdb",
"raid" => "RAID0",
"skip_security" => true
));
@@ -61,7 +61,6 @@ $CAMERA_SERVERS = array_merge($IPE_SERVERS, array(
$STUDENT_SERVERS = array_merge($IPE_SERVERS, array(
"base_ip" => 60,
"eth" => array("enp9s0", "enp6s0"),
- "sysdisks" => "sda,sdb",
"append_sol" => "",
"skip_security" => true
));
@@ -74,7 +73,6 @@ $SERVER_LIST = array(
"ip" => "192.168.26.254",
"netmask" => "255.255.255.0",
"gw" => "192.168.26.117",
- "sysdisks" => "sda,sdb",
"raid" => "RAID0",
"size" => "60000",
"ethdev" => "link",
@@ -104,7 +102,7 @@ $SERVER_LIST = array(
"ipecompute1" => array_merge($COMPUTE_SERVERS, array(
"macs" => array("00:30:48:dd:5e:82", "00:30:48:dd:5e:83"),
"eth" => array("enp5s0", "enp6s0"),
- "sysdisks" => "sdb",
+// "sysdisks" => "sdb",
"driverdisk" => "kmod-arcmsr.rpm"
)),
"ipecompute3" => array_merge($COMPUTE_SERVERS, array(
@@ -113,7 +111,7 @@ $SERVER_LIST = array(
)),
"ipecompute2" => array_merge($COMPUTE_SERVERS, array(
"macs" => array("00:25:90:95:7c:6c", "00:25:90:95:7c:6d"),
- "sysdisks" => "sdb,sdc"
+ "sysdisks" => "sdb,sdc",
)),
"ipecompute4" => array_merge($COMPUTE_SERVERS, array(
"macs" => array("0c:c4:7a:b3:28:8c", "0c:c4:7a:b3:28:8d"),
diff --git a/ipe.ks b/ipe.ks
index 475755b..59cea59 100644
--- a/ipe.ks
+++ b/ipe.ks
@@ -47,14 +47,16 @@ logvol / --vgname=sysvg --size=@SIZE@ --name=lv_root --fstype=ext4
# Root password (KaaS)
#rootpw --iscrypted $6$ihAbktYN$T36KRAmi8ccjNrE5Y0gEl11Rb/dl3GjemejAJyHVzrAL51/st7aMZ0dqnMIkhubX/gUcPe5LdTlJODC9D/60h0
-# Root passowrd (IPE)
-rootpw --iscrypted $6$ioKrEQSxzYypx2HZ$jiynrl6knbmhbL066k.HjmxcwvQwBsT53LPlp2fRdkg2E1E7Gy4gwxaZ0m86rbD6q4dTaWdYfKhDVSij6N1Y7.
+# Root passowrd (IPE, old and compromised)
+#rootpw --iscrypted $6$ioKrEQSxzYypx2HZ$jiynrl6knbmhbL066k.HjmxcwvQwBsT53LPlp2fRdkg2E1E7Gy4gwxaZ0m86rbD6q4dTaWdYfKhDVSij6N1Y7.
+# Root password (IPE, mid-secure)
+rootpw --iscrypted $6$6qbYQDyLZcG6z9M/$qtkNhr3BB3uJinEZrhE1bTomJtT1qxDiavMadLfCVVM.F5Qv20a30Ovam7TzwUR1.G7bik25I8uNx09Qxl4Fe0
# System services
services --enabled="chronyd"
# System timezone
timezone Europe/Berlin --isUtc --ntpservers=@TIME@
-user --groups=wheel --name=csa --gecos="Suren A. Chilingaryan"
+user --groups=wheel --name=csa --uid=1001 --gid=1001 --gecos="Suren A. Chilingaryan"
# SELinux configuration
@SKIP_SECURITY@selinux --disabled
@@ -104,7 +106,7 @@ if [ -b /dev/@DISK1@ ]; then
dd if=/dev/zero of=$name bs=4096 seek=$(( $(blockdev --getsz $name) - 1024 )) count=1024
done
dd if=/dev/zero of=/dev/@DISK1@ bs=4096 count=1024
- #parted /dev/@DISK1@ --script -- mklabel gpt
+ parted /dev/@DISK1@ --script -- mklabel gpt
fi
if [ -b /dev/@DISK2@ ]; then
for name in /dev/@DISK2@?*; do
@@ -114,8 +116,10 @@ if [ -b /dev/@DISK2@ ]; then
dd if=/dev/zero of=$name bs=4096 seek=$(( $(blockdev --getsz $name) - 1024 )) count=1024
done
dd if=/dev/zero of=/dev/@DISK2@ bs=4096 count=1024
- #parted /dev/@DISK2@ --script -- mklabel gpt
+ parted /dev/@DISK2@ --script -- mklabel gpt
fi
+# wait for partition table to propogate
+sleep 10
@DISTRIB_PRE_CONFIG@
@NODE_PRE_CONFIG@