remove j2 file extensions

tasks/build_iso.yaml

@@ -90,7 +90,7 @@
 
 - name: Build ISO - Modify Source - Copy Preseed
   template:
-    src: preseed-usb.cfg.j2
+    src: preseed-usb.cfg
     dest: "{{ deb13_src }}/preseed.cfg"
     mode: 0644
 

tasks/config_pxe.yaml

@@ -25,14 +25,14 @@
 # Copy DHCP config file 1
 - name: DHCP - Copy dhcpd.conf
   template:
-    src: dhcpd.conf.j2
+    src: dhcpd.conf
     dest: /etc/dhcp/dhcpd.conf
     mode: 0644
 
 # Copy DHCP config file 2
 - name: DHCP - Copy isc-dhcp-server
   template:
-    src: isc-dhcp-server.j2
+    src: isc-dhcp-server
     dest: /etc/default/isc-dhcp-server
     mode: 0644
 
@@ -46,7 +46,7 @@
 # Download vendor list for dhcp-lease-list
 - name: DHCP - Download vendor list for dhcp-lease-list
   get_url:
-    url: "http://standards-oui.ieee.org/oui.txt"
+    url: "https://standards-oui.ieee.org/oui.txt"
     dest: /usr/local/etc/oui.txt
     mode: '0644'
 
@@ -73,7 +73,7 @@
 # Copy TFTP Config File
 - name: TFTP - Copy tftpd-hpa
   template:
-    src: tftpd-hpa.j2
+    src: tftpd-hpa
     dest: /etc/default/tftpd-hpa 
     mode: 0644
 
@@ -122,14 +122,14 @@
   - name: Files - Copy grub.cfg to tftp
     when: not deploy_iso | bool
     template:
-      src: grub.cfg.j2
+      src: grub.cfg
       dest: /srv/tftp/debian-installer/amd64/grub/grub.cfg
       mode: 0644
 
   - name: Files - Copy grub-iso.cfg to tftp
     when: deploy_iso | bool
     template:
-      src: grub-iso.cfg.j2
+      src: grub-iso.cfg
       dest: /srv/tftp/debian-installer/amd64/grub/grub.cfg
       mode: 0644
 
@@ -137,7 +137,7 @@
 # It's served from HTTP now because bollocks to weird TFTP foolishness
 - name: Files - Copy server preseed to http
   template:
-    src: preseed-server-v2.cfg.j2
+    src: preseed-server-v2.cfg
     dest: /var/www/html/preseed-server.cfg
     mode: 0644
 

tasks/config_routing.yaml

@@ -8,7 +8,8 @@
 # Update sysctl.conf file to enable IP forwarding    
 - name: sysctl - enable IP forwarding  
   lineinfile:
-    path: /etc/sysctl.conf
+    create: true
+    path: /etc/sysctl.d/ip_forwarding.conf
     regexp: '^net.ipv4.ip_forward='
     line: 'net.ipv4.ip_forward=1'
 

tasks/main.yaml

@@ -2,7 +2,7 @@
 # This role builds a pxe server and / or an ISO for the amd64 matt-cloud base image
 
 - name: PXE Server - Architecture Warning
-  when: '"arm" in cpu_architecture'
+  when: armcpu_check | bool
   debug:
     msg: "Warning - ARM CPU Detected, will not proceed"
 
@@ -16,7 +16,7 @@
 
 - name: PXE Server - Build Deb12-MC.iso
   include_tasks: build_iso.yaml
-  when: '"amd" in cpu_architecture'
+  when: not armcpu_check | bool
 
 ...