diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index 47f9b774..8e6733b7 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -464,7 +464,7 @@ bootloaders: - type: "USB" ipxe_bin: "ipxe-efi.usb" output_bin: "-efi.usb" - desc: "Used for booting from GRUB/EXTLINUX" + desc: "Used for creation of USB Keys" - type: "DHCP" ipxe_bin: "ipxe.efi" output_bin: ".efi" diff --git a/roles/netbootxyz/tasks/generate_checksums.yml b/roles/netbootxyz/tasks/generate_checksums.yml index d8c15fda..c5400782 100644 --- a/roles/netbootxyz/tasks/generate_checksums.yml +++ b/roles/netbootxyz/tasks/generate_checksums.yml @@ -26,6 +26,12 @@ src: checksums.txt.j2 dest: "{{ netbootxyz_root }}/ipxe/{{ checksums_filename }}" + - name: Generate site name banner for index + shell: toilet -f standard {{ site_name }} --html | grep span + register: index_title + tags: + - skip_ansible_lint + - name: Generate netboot.xyz index template template: src: index.html.j2 diff --git a/roles/netbootxyz/templates/index.html.j2 b/roles/netbootxyz/templates/index.html.j2 index 8b86eef3..de02a1c4 100644 --- a/roles/netbootxyz/templates/index.html.j2 +++ b/roles/netbootxyz/templates/index.html.j2 @@ -23,12 +23,7 @@ chain --autofree http://{{ boot_domain }}/menu.ipxe || echo HTTP failed, localbo
-             _   _                 _                    
-  _ __   ___| |_| |__   ___   ___ | |_  __  ___   _ ____
- | '_ \ / _ \ __| '_ \ / _ \ / _ \| __| \ \/ / | | |_  /
- | | | |  __/ |_| |_) | (_) | (_) | |_ _ >  <| |_| |/ / 
- |_| |_|\___|\__|_.__/ \___/ \___/ \__(_)_/\_\\__, /___|
-                                              |___/     
+ {{ index_title.stdout }}

Version: {{ boot_version }}
Powered by netboot.xyz diff --git a/roles/netbootxyz/vars/debian.yml b/roles/netbootxyz/vars/debian.yml index 3551ac9a..2064e58b 100644 --- a/roles/netbootxyz/vars/debian.yml +++ b/roles/netbootxyz/vars/debian.yml @@ -12,3 +12,4 @@ netbootxyz_packages: - liblzma-dev - syslinux - syslinux-common + - toilet diff --git a/roles/netbootxyz/vars/redhat.yml b/roles/netbootxyz/vars/redhat.yml index 161d36f5..a8235adc 100644 --- a/roles/netbootxyz/vars/redhat.yml +++ b/roles/netbootxyz/vars/redhat.yml @@ -7,4 +7,5 @@ netbootxyz_packages: - httpd - minizip-devel - syslinux + - toilet - xz-devel diff --git a/roles/netbootxyz/vars/ubuntu.yml b/roles/netbootxyz/vars/ubuntu.yml index 3551ac9a..2064e58b 100644 --- a/roles/netbootxyz/vars/ubuntu.yml +++ b/roles/netbootxyz/vars/ubuntu.yml @@ -12,3 +12,4 @@ netbootxyz_packages: - liblzma-dev - syslinux - syslinux-common + - toilet diff --git a/script/retrieve_certs b/script/retrieve_certs index fe3eef4d..c97ab9a6 100755 --- a/script/retrieve_certs +++ b/script/retrieve_certs @@ -5,4 +5,4 @@ set -e git clone https://$GIT_USER:$GIT_AUTH@$GIT_URL certs cp certs/certs.tar.enc . openssl aes-256-cbc -K $encrypted_9ca5918f08ba_key -iv $encrypted_9ca5918f08ba_iv -in certs.tar.enc -out certs.tar -d -tar xvf certs.tar -C certs +tar xf certs.tar -C certs