Update kickstart configuration

6 files changed, 29 insertions, 144 deletions

diff --git a/kickstart/kickstart/authorized_keys b/kickstart/kickstart/authorized_keys
new file mode 100644
index 0000000..f7b2526
--- /dev/null
+++ b/kickstart/kickstart/authorized_keys
@@ -0,0 +1,4 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNetzktlBAcbsrdYEDim7x1JAbcN9n4W6BZKJsB3fim csa@styx
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0r0MkNhJ3ooBNlz2GNfwGCULhmwzVyfWXlogS0E96dUUKSsvVQGbHHq+Ig8fkFNSAXIuIouAVN/IzWZesAXDd6oIsW880cJkfoGhJfFHa9gmOT9hgzybByhSxk+ovPWv2kqpGaqF8WbXlWwrjeMqRN5gbKwS4BcH3nb4Xt6ghOXAaCm1LTMFmmq8xfW0RWFFKm8tmORcUtEwtj4X1lUtMJ64arGLkyhIPu2PTbgeS6yPqkdws4xTczw9ngOyGw6RXb2Pyrs2igUAfRlrYK6vZrmzFn6yjPWY7WMkgO7BHR009fFAKzF8d4kVmGNkiuQE36IajEg+Idpo5a5sJc+WSok7oaxg3/blCY6rPkx3YHAdi7eTbqLea9j27gxJUzaIqu/loGU3gn/ddm+4vwsEiE/ZM368WOyetvrOz7sskjLCI+BhiKXbyTd8dFPDQQMgIrOlipqC3ikIDHKzruYzNGpplI5Yua0y1SvM3dVLumR0hCjUiw9Ew4M2eFGR2HNH7f4rq00bSMPhZmoIzPYhaAqS1QKKNx+TlFqfu30jckfHiBNFZ0bBwG+dNg+dG2GpWaOWLFKeoyV1xNJ/m8pCY4eRSdMUFtRH0Dq9vP5NoFQHzxwAREly/OZbNSAFWGYKKDX+ZGQR33qGfkicl0g/8Ul6zP5mjsRaHiIWvL4W3wQ== csa@styx
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIsJNm47UfzMUWMPAereBiqHQwvtKowirnp0pzCILSRztEWkKurnwyQmV9r4ZXibFS0dgN8aMgOoingLZOJnDUeelBMYZraEphAaQ3zkkYroZo7oJ9Ouuv5xYrhlKNKtrRDBpVuEcmmfNesRFB9Snb9QR3H90AlKh9KJmJcRPPGboCgyeGqTPVu6hJBwePqn4d8DPSGLCl8YP6XXhMMfVTxC4BBuKFvfIrD3yeyvnBVCIael6swytss6IK28BF3z/lahA2uNjhiy0rNKx2WHAAiUxaCRyLrmnJpCblvjlJ9OkwqDWrumVC8K0bVXeoyvZi2iICS2AZoKc0hREpJKo7 csa@gpg
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXdXQHy2GMS467G1yorHyMnjj6Wo3jVYqVLlN3pYBRGkPZOhyaAFXsEOH0roeg4h+0cFgha+d9+naB6d0dKhfw131wb05yZih+H6+eWOTpl1u+gkkOdMmwyKd7ymSSGFueDGQyVAx3WDPgoUgz9Y2SJsKe0cJPOON9kdPFwGN7tfHt3GJ2VoqwUnuFvQ2deCTPzvir2kC4RyuhasbZtY69/rOpxo99eZFMgChG/ftqeLOl0xyJ2If5u9sZeyR5i9ytvHsq59FGF6BpKJtLmC0wkqBvImUYQWXYmClT5Lo7vZfkbJnWjeuQH5JJ75mcl4XTtdjx+QIK8aSeznclLDlN Android
diff --git a/kickstart/kickstart/authorized_keys.csa b/kickstart/kickstart/authorized_keys.csa
new file mode 100644
index 0000000..f7b2526
--- /dev/null
+++ b/kickstart/kickstart/authorized_keys.csa
@@ -0,0 +1,4 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNetzktlBAcbsrdYEDim7x1JAbcN9n4W6BZKJsB3fim csa@styx
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0r0MkNhJ3ooBNlz2GNfwGCULhmwzVyfWXlogS0E96dUUKSsvVQGbHHq+Ig8fkFNSAXIuIouAVN/IzWZesAXDd6oIsW880cJkfoGhJfFHa9gmOT9hgzybByhSxk+ovPWv2kqpGaqF8WbXlWwrjeMqRN5gbKwS4BcH3nb4Xt6ghOXAaCm1LTMFmmq8xfW0RWFFKm8tmORcUtEwtj4X1lUtMJ64arGLkyhIPu2PTbgeS6yPqkdws4xTczw9ngOyGw6RXb2Pyrs2igUAfRlrYK6vZrmzFn6yjPWY7WMkgO7BHR009fFAKzF8d4kVmGNkiuQE36IajEg+Idpo5a5sJc+WSok7oaxg3/blCY6rPkx3YHAdi7eTbqLea9j27gxJUzaIqu/loGU3gn/ddm+4vwsEiE/ZM368WOyetvrOz7sskjLCI+BhiKXbyTd8dFPDQQMgIrOlipqC3ikIDHKzruYzNGpplI5Yua0y1SvM3dVLumR0hCjUiw9Ew4M2eFGR2HNH7f4rq00bSMPhZmoIzPYhaAqS1QKKNx+TlFqfu30jckfHiBNFZ0bBwG+dNg+dG2GpWaOWLFKeoyV1xNJ/m8pCY4eRSdMUFtRH0Dq9vP5NoFQHzxwAREly/OZbNSAFWGYKKDX+ZGQR33qGfkicl0g/8Ul6zP5mjsRaHiIWvL4W3wQ== csa@styx
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIsJNm47UfzMUWMPAereBiqHQwvtKowirnp0pzCILSRztEWkKurnwyQmV9r4ZXibFS0dgN8aMgOoingLZOJnDUeelBMYZraEphAaQ3zkkYroZo7oJ9Ouuv5xYrhlKNKtrRDBpVuEcmmfNesRFB9Snb9QR3H90AlKh9KJmJcRPPGboCgyeGqTPVu6hJBwePqn4d8DPSGLCl8YP6XXhMMfVTxC4BBuKFvfIrD3yeyvnBVCIael6swytss6IK28BF3z/lahA2uNjhiy0rNKx2WHAAiUxaCRyLrmnJpCblvjlJ9OkwqDWrumVC8K0bVXeoyvZi2iICS2AZoKc0hREpJKo7 csa@gpg
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXdXQHy2GMS467G1yorHyMnjj6Wo3jVYqVLlN3pYBRGkPZOhyaAFXsEOH0roeg4h+0cFgha+d9+naB6d0dKhfw131wb05yZih+H6+eWOTpl1u+gkkOdMmwyKd7ymSSGFueDGQyVAx3WDPgoUgz9Y2SJsKe0cJPOON9kdPFwGN7tfHt3GJ2VoqwUnuFvQ2deCTPzvir2kC4RyuhasbZtY69/rOpxo99eZFMgChG/ftqeLOl0xyJ2If5u9sZeyR5i9ytvHsq59FGF6BpKJtLmC0wkqBvImUYQWXYmClT5Lo7vZfkbJnWjeuQH5JJ75mcl4XTtdjx+QIK8aSeznclLDlN Android
diff --git a/kickstart/kickstart/index.php b/kickstart/kickstart/index.php
index 7ea2e54..9336fb8 100644
--- a/kickstart/kickstart/index.php
+++ b/kickstart/kickstart/index.php
@@ -4,13 +4,13 @@
 
 # disks will be synchronized with k3
 $KATRIN_SERVERS = array(
-    "ks" => "ipekatrin-v3.ks",
+    "ks" => "ipekatrin-v4.ks",
     "domain" => "ipe.kit.edu",
     "netmask" => "255.255.254.0",
     "gw" => "141.52.64.207",
     "ns" => "141.52.3.3,141.52.8.18",
     "time" => "141.52.8.18",
-    "sysdisks" => "sdc,sdd",
+    "sysdisks" => "sdb,sdc",
     "append_sol" => "console=tty1 console=ttyS1,115200 earlyprint=serial,ttyS1,115200",
     "raid" => "RAID1",
     "size" => "80000",
@@ -21,7 +21,7 @@ $KATRIN_SERVERS = array(
 
 $SERVER_LIST = array(
     "ipecsavm" => array_merge($KATRIN_SERVERS, array(
-	"ks" => "ipekatrin-v2.ks",
+	"ks" => "ipekatrin-v4.ks",
 	"macs" => array("66:66:66:13:13:00"),
 	"ip" => "192.168.26.254",
 	"netmask" => "255.255.255.0",
@@ -46,7 +46,6 @@ $SERVER_LIST = array(
     )),
     "ipekatrin3" => array_merge($KATRIN_SERVERS, array(
 	"macs" => array("0c:c4:7a:a8:81:3e", "0c:c4:7a:a8:81:3f"),
-	"sysdisks" => "sdb,sdc",
 	"ethdev" => "eno2",
 	"ethdev2" => "eno1",
     ))
diff --git a/kickstart/kickstart/ipekatrin-v2.ks b/kickstart/kickstart/ipekatrin-v2.ks
deleted file mode 100644
index 5adc31f..0000000
--- a/kickstart/kickstart/ipekatrin-v2.ks
+++ /dev/null
@@ -1,82 +0,0 @@
-#version=DEVEL
-
-# System authorization information
-auth --enableshadow --passalgo=sha512
-
-# Use CDROM installation media
-cdrom
-
-# Use graphical install (graphical is enforce by vnc requested at kernel args)
-#text
-graphical
-
-# Run the Setup Agent on first boot
-firstboot --enable
-ignoredisk --only-use=@SYSDISKS@
-# Keyboard layouts
-keyboard --vckeymap=us --xlayouts='us'
-# System language
-lang en_US.UTF-8
-
-# Network information (device=link signifies first device link active)
-network --device=link --bootproto=static --ip=@IP@ --netmask=@NETMASK@ --gateway=@GW@ --nameserver=@NS@ --noipv6 --onboot=on --activate
-#network --bootproto=dhcp --device=eth0 --ipv6=auto --activate
-network  --hostname=@FQDN@
-
-
-# Partition clearing information
-clearpart --all --drives=@SYSDISKS@
-zerombr
-
-# System bootloader configuration
-bootloader --location=mbr --driveorder=@SYSDISKS@ --boot-drive=@BOOTDISK@  --append=" crashkernel=auto @APPEND_SOL@"
-
-#autopart --type=lvm
-#reqpart --add-boot
-part raid.01 --ondisk=@DISK1@ --asprimary --size @BOOTSIZE@
-part raid.02 --ondisk=@DISK2@ --asprimary --size @BOOTSIZE@
-part swap --ondisk=@DISK1@ --asprimary --fstype=swap --recommended 
-part swap --ondisk=@DISK2@ --asprimary --fstype=swap --recommended 
-part raid.03 --ondisk=@DISK1@ --asprimary --size @SIZE@ --grow
-part raid.04 --ondisk=@DISK2@ --asprimary --size @SIZE@ --grow
-raid /boot --level=@RAID@ --device md0 raid.01 raid.02 --fstype=ext4
-raid pv.01 --level=@RAID@ --device=md1 raid.03 raid.04
-volgroup sysvg pv.01
-logvol / --vgname=sysvg --size=@SIZE@ --name=lv_root --fstype=ext4
-
-# Root password (new)
-rootpw --iscrypted $6$ihAbktYN$T36KRAmi8ccjNrE5Y0gEl11Rb/dl3GjemejAJyHVzrAL51/st7aMZ0dqnMIkhubX/gUcPe5LdTlJODC9D/60h0
-# Root passowrd (old)
-#rootpw --iscrypted $6$ioKrEQSxzYypx2HZ$jiynrl6knbmhbL066k.HjmxcwvQwBsT53LPlp2fRdkg2E1E7Gy4gwxaZ0m86rbD6q4dTaWdYfKhDVSij6N1Y7.
-		    
-# System services
-services --enabled="chronyd"
-# System timezone
-timezone Europe/Berlin --isUtc --ntpservers=@TIME@
-user --groups=wheel --name=csa  --gecos="Suren A. Chilingaryan"
-
-# SELinux configuration
-#selinux --disabled
-
-# Do not configure the X Window System
-skipx
-
-install
-poweroff
-
-
-%packages
-@^minimal
-@core
-chrony
-kexec-tools
-
-%end
-%addon com_redhat_kdump --enable --reserve-mb='auto'
-%end
-
-%anaconda
-pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --notempty
-pwpolicy user --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
-pwpolicy luks --minlen=6 --minquality=1 --notstrict --nochanges --notempty
-%end
diff --git a/kickstart/kickstart/ipekatrin-v3.ks b/kickstart/kickstart/ipekatrin-v4.ks
index ae5aa35..ba1a30a 100644
--- a/kickstart/kickstart/ipekatrin-v3.ks
+++ b/kickstart/kickstart/ipekatrin-v4.ks
@@ -71,8 +71,9 @@ poweroff
 @core
 chrony
 kexec-tools
-
+curl
 %end
+
 %addon com_redhat_kdump --enable --reserve-mb='auto'
 %end
 
@@ -81,3 +82,19 @@ pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --notempty
 pwpolicy user --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
 pwpolicy luks --minlen=6 --minquality=1 --notstrict --nochanges --notempty
 %end
+
+
+%post --log=/var/log/ks01.log
+yum install -y unzip
+
+mkdir /root/.ssh
+chmod 0700 /root/.ssh
+curl http://ufo.kit.edu/ands/kickstart/authorized_keys -o /root/.ssh/authorized_keys
+chmod 0600 /root/.ssh/authorized_keys
+
+mkdir /home/csa/.ssh
+chmod 0700 /home/csa/.ssh
+curl http://ufo.kit.edu/ands/kickstart/authorized_keys.csa -o /home/csa/.ssh/authorized_keys
+chown -R csa:user /home/csa/.ssh
+chmod 0600 /home/csa/.ssh/authorized_keys
+%end
diff --git a/kickstart/kickstart/ipekatrin.ks b/kickstart/kickstart/ipekatrin.ks
deleted file mode 100644
index b394ca8..0000000
--- a/kickstart/kickstart/ipekatrin.ks
+++ /dev/null
@@ -1,57 +0,0 @@
-#version=DEVEL
-# System authorization information
-auth --enableshadow --passalgo=sha512
-# Use CDROM installation media
-cdrom
-# Use graphical install (graphical is enforce by vnc requested at kernel args)
-#graphical
-text
-
-# Run the Setup Agent on first boot
-firstboot --enable
-ignoredisk --only-use=@SYSDISKS@
-# Keyboard layouts
-keyboard --vckeymap=us --xlayouts='us'
-# System language
-lang en_US.UTF-8
-
-# Network information
-#network  --bootproto=dhcp --device=eth0 --ipv6=auto --activate
-network  --bootproto=static --ip=@IP@ --netmask=@NETMASK@ --gateway=@GW@ --nameserver=@NS@ --device=eth0 --ipv6=auto --activate
-network  --hostname=@FQDN@
-
-# Root password
-rootpw --iscrypted $6$ioKrEQSxzYypx2HZ$jiynrl6knbmhbL066k.HjmxcwvQwBsT53LPlp2fRdkg2E1E7Gy4gwxaZ0m86rbD6q4dTaWdYfKhDVSij6N1Y7.
-# System services
-services --enabled="chronyd"
-# System timezone
-timezone Europe/Berlin --isUtc --ntpservers=@TIME@
-user --groups=wheel --name=csa --password=$6$H8NeYbDfSuTtJKmA$pyUj57Ao1gAyT2C8ijivRxTMTkTClpOFUigmxsgKZ1L71Np6URTT4s6PU6WsuoEQgHgo9XjJNGePg/RneBY9a1 --iscrypted --gecos="Suren A. Chilingaryan"
-# System bootloader configuration
-bootloader --append=" crashkernel=auto" --location=mbr --boot-drive=@BOOTDISK@
-autopart --type=lvm
-# Partition clearing information
-clearpart --all --initlabel --drives=@SYSDISKS@
-
-
-
-%packages
-@^minimal
-@core
-chrony
-kexec-tools
-
-%end
-
-%addon com_redhat_kdump --enable --reserve-mb='auto'
-
-%end
-
-%anaconda
-pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --notempty
-pwpolicy user --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
-pwpolicy luks --minlen=6 --minquality=1 --notstrict --nochanges --notempty
-%end
-
-
-poweroff