diff --git a/cleanup_amis.sh b/cleanup_amis.sh index d889d20..a7d3712 100755 --- a/cleanup_amis.sh +++ b/cleanup_amis.sh @@ -6,7 +6,7 @@ read #TAG_FILTER="Name=tag:project,Values=zdt-alpine" #TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.0-x86_64-bios-tiny-minimal-r0" -TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r1" +TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r0" #for r in $(aws ec2 describe-regions --query "Regions[].{Name:RegionName}" --output text); do for r in ap-southeast-2 ca-central-1 eu-central-1 us-east-1 us-west-1 us-west-2; do diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age index dcdbe72..e7591ef 100644 Binary files a/overlay/zdt/configs/access.conf.age and b/overlay/zdt/configs/access.conf.age differ diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/common-packages.conf index 14b1323..9580b11 100644 --- a/overlay/zdt/configs/common-packages.conf +++ b/overlay/zdt/configs/common-packages.conf @@ -16,6 +16,7 @@ dhclient = true monit = true busybox-extras = true tcpdump = true +neofetch = edge-community tiny-cloud = edge-main tiny-cloud-openrc = edge-main tiny-cloud-network = edge-main diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/kubezero.conf index f3d5e56..aa6ba9a 100644 --- a/overlay/zdt/configs/kubezero.conf +++ b/overlay/zdt/configs/kubezero.conf @@ -5,7 +5,7 @@ include required("common.conf") packages { include required("kubezero-packages.conf") } description = [ "- https://kubezero.com" ] -name = [ kubezero-1.23.10 ] +name = [ kubezero-1.23.11 ] # size = 2G WHEN { diff --git a/overlay/zdt/configs/zdt.conf b/overlay/zdt/configs/zdt.conf index a7532a6..7d2fff7 100644 --- a/overlay/zdt/configs/zdt.conf +++ b/overlay/zdt/configs/zdt.conf @@ -11,13 +11,6 @@ Default { name = [ zdt-alpine ] description = [ "ZeroDownTime Alpine Images" ] - motd { - welcome = "Welcome to Alpine - ZeroDownTime edition" - version_notes = "Release Notes:\n"\ - "* " - release_notes = "* " - } - # initial provisioning script and data directory scripts = [ setup ] script_dirs = [ setup.d ] diff --git a/overlay/zdt/scripts/setup-common b/overlay/zdt/scripts/setup-common index 4fdd039..8ea8449 100755 --- a/overlay/zdt/scripts/setup-common +++ b/overlay/zdt/scripts/setup-common @@ -65,4 +65,10 @@ echo 'Enable monit via init, hooked up cloudbender alerting' mv $TARGET/etc/profile.d/color_prompt.sh.disabled $TARGET/etc/profile.d/color_prompt.sh echo 'alias rs="doas bash --login"' > $TARGET/etc/profile.d/alias.sh +# branding +rm -f $TARGET/etc/motd +cp $SETUP/neofetch.conf $TARGET/etc/neofetch.conf +cp $SETUP/zdt-ascii.txt $TARGET/etc/neofetch-logo.txt +echo 'neofetch --config /etc/neofetch.conf' > $TARGET/etc/profile.d/motd.sh + printf '\n# Zero Down Time config applied' diff --git a/overlay/zdt/scripts/setup.d/neofetch.conf b/overlay/zdt/scripts/setup.d/neofetch.conf new file mode 100644 index 0000000..5346986 --- /dev/null +++ b/overlay/zdt/scripts/setup.d/neofetch.conf @@ -0,0 +1,34 @@ +print_info() { + echo -e "\n\n" + + prin "$(color 1)Welcome to Alpine - ZeroDownTime edition" + echo + prin "Release Notes:" + prin " - " + prin " - " + echo + + info title + info underline + + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + # info "Packages" packages + info "CPU" cpu + info "GPU" gpu + info "Memory" memory + + info "GPU Driver" gpu_driver # Linux/macOS only + info "CPU Usage" cpu_usage + info "Local IP" local_ip + info "Disk" disk + + info underline +} + +title_fqdn="on" +memory_percent="on" +colors=(1 2 15 15 15 15) +image_source="/etc/neofetch-logo.txt" +gap=0 diff --git a/overlay/zdt/scripts/setup.d/zdt-ascii.txt b/overlay/zdt/scripts/setup.d/zdt-ascii.txt new file mode 100644 index 0000000..b3e74e5 --- /dev/null +++ b/overlay/zdt/scripts/setup.d/zdt-ascii.txt @@ -0,0 +1,21 @@ +\x1b[38;2;32;120;108m .. + ox@@@@@x + -x@@@@@@@@@@@@x- + .x@@@x- -x@@@x. + ox@@@@x ox@@@@@@@@x- x@@@@xo + @@@@@@@@ x@@@@@@@@@@@@x @@@@@@@@o + o @@@@@x -x@@@@@@@@x- x@@@@@ o + @@@x- @@@x- -x@@@o .x@@@. + @@@@@@@x. x@@@@@@@@@@@@@ o@@@@@@@. + @@@@@@@@@@xo @@@@@@ -x@@@@@xx@@@. + @@@@@@@@@@@@@@x- .x@@@@@x- -@@@. + @@@@@@@@ @@@@@@@@ x@@@@@x ox x@@@. + @@@@ -@@ @@@@@@@@ @@@@ -x@@x .@@@@@. + @@@@x @ @@@@@@@@ @@@x .-o .x@@@. + @@@@@x @xoo@@@@ @@@@xx .xxx -@@@. + @@@@@@@ @@@@ @@@@@ x@xo x@@@. + @@@@@@@. -x@@@@@@ @@@@ x. -x@@@@@ + .@@@@@@@@@@@@@ @@@x .x@@@@@x + x@@@@@@@@@ @@@@x@@@@@ + @@@@@@ @@@@@@. + o@@ @@x