bye for now to grist

host_vars/nuc1.servers.bornhack.org.yml

@@ -263,17 +263,6 @@ network_interfaces:
     pf_upstream: False
     pf_routing: True
 
-  - name: "epair18a"
-    description: "vnet interface for grist1.servers.bornhack.org"
-    configure: False
-    interface: "epair18a"
-    pf_macro: "grist1_if"
-    pf_scrub: True
-    pf_sync: False
-    pf_carp: False
-    pf_upstream: False
-    pf_routing: True
-
 
 static_routes:
   - name: "dgw_ipv4"
@@ -339,7 +328,6 @@ pf_filter_rules:
       - "<prometheus2>"
       - "<django6>"
       - "<django7>"
-      - "<grist1>"
     ports:
       - "22"
 
@@ -478,7 +466,6 @@ pf_filter_rules:
       - "<django7>"
       - "<dns1>"
       - "<grafana2>"
-      - "<grist1>"
       - "<imap3>"
       - "<people3>"
       - "<postgres1>"
@@ -596,19 +583,6 @@ pf_filter_rules:
     ports:
       - "80"
 
-  - comment: "grist1: allow http from webproxy3"
-    direction: "out"
-    interfaces:
-      - "$bridge_rfc1918_if"
-    protocols:
-      - "tcp"
-    sources:
-      - "<webproxy3>"
-    destinations:
-      - "<grist1>"
-    ports:
-      - "80"
-
 
 ########## jails ############
 
@@ -853,14 +827,3 @@ jails:
     allow_mount_zfs: 1
     zfs_datasets:
       - "tank0/jailstorage/django7.servers.bornhack.org"
-
-  - hostname: "grist1.servers.bornhack.org"
-    interfaces:
-      - epair: 18
-        bridge: "bridge1" # rfc1918 v4 & routed v6
-        ifconfig_inet: "10.1.0.14/24"
-        ifconfig_inet6: "2a09:94c4:55d1:76a0::14/64"
-    routes:
-      - "-inet default 10.1.0.1"
-      - "-inet6 default 2a09:94c4:55d1:76a0::1"
-    devfs_ruleset: 5

include_vars/pf_vars.yml

@@ -113,10 +113,6 @@ pf_common_address_macros: |
     prometheus2v6="2a09:94c4:55d1:76a0::11"
     table <prometheus2> { $prometheus2v4 $prometheus2v6 }
 
-    grist1v4="10.1.0.14"
-    grist1v6="2a09:94c4:55d1:76a0::14"
-    table <grist1> { $grist1v4 $grist1v6 }
-
     ############################################
     ### TABLES
     ############################################