From 533dc8faf1b0622a33610f644e13844e67e57560 Mon Sep 17 00:00:00 2001 From: Lino Date: Mon, 13 May 2024 18:13:07 +0200 Subject: [PATCH 1/3] campfunk: init location --- locations/camp1.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++ locations/camp2.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++ locations/camp3.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++ locations/camp4.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++ locations/camp5.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 345 insertions(+) create mode 100644 locations/camp1.yml create mode 100644 locations/camp2.yml create mode 100644 locations/camp3.yml create mode 100644 locations/camp4.yml create mode 100644 locations/camp5.yml diff --git a/locations/camp1.yml b/locations/camp1.yml new file mode 100644 index 000000000..eb3fca8bb --- /dev/null +++ b/locations/camp1.yml @@ -0,0 +1,69 @@ +--- +location: camp1 +location_nice: campfunk.freifunk.net#1 +latitude: 12.00300 +longitude: 13.00200 +community: true + +hosts: + - hostname: camp1-core + role: corerouter + model: "glinet_gl-mt1300" + wireless_profile: freifunk_default + packages__to_merge: + - "kmod-usb-net-rndis" + - "usb-modeswitch" + +# camp1: +# --MGMT: 10.31.0.76/32 +# --DHCP: 10.31.202.0/26 +# --MESH: 10.31.202.64/30 + +ipv6_prefix: 2001:bf7:750:5e00::/56 + +networks: + + - vid: 20 + role: mesh + name: mesh_camp + prefix: 10.31.202.64/32 + ipv6_subprefix: -20 + mesh_ap: camp1-core + mesh_radio: 11a_standard + mesh_iface: mesh + + - vid: 40 + role: dhcp + name: dhcp + prefix: 10.31.202.0/26 + ipv6_subprefix: -40 + inbound_filtering: true + enforce_client_isolation: true + assignments: + camp1-core: 1 + + - vid: 42 + role: mgmt + prefix: 10.31.0.76/32 + gateway: 1 + dns: 1 + ipv6_subprefix: 0 + assignments: + camp1-core: 1 + + - vid: 50 + role: uplink + untagged: true + ifname: eth1 + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.31.202.65/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.31.202.66/32 + wireguard_port: 51821 diff --git a/locations/camp2.yml b/locations/camp2.yml new file mode 100644 index 000000000..fd0a69d99 --- /dev/null +++ b/locations/camp2.yml @@ -0,0 +1,69 @@ +--- +location: camp2 +location_nice: campfunk.freifunk.net#2 +latitude: 12.00300 +longitude: 13.00300 +community: true + +hosts: + - hostname: camp2-core + role: corerouter + model: "glinet_gl-mt1300" + wireless_profile: freifunk_default + packages__to_merge: + - "kmod-usb-net-rndis" + - "usb-modeswitch" + +# camp2 +# --MGMT: 10.31.0.77/32 +# --DHCP: 10.31.202.128/26 +# --MESH: 10.31.202.68/30 + +ipv6_prefix: 2001:bf7:750:5800::/56 + +networks: + + - vid: 20 + role: mesh + name: mesh_camp + prefix: 10.31.202.68/32 + ipv6_subprefix: -20 + mesh_ap: camp2-core + mesh_radio: 11a_standard + mesh_iface: mesh + + - vid: 40 + role: dhcp + name: dhcp + prefix: 10.31.202.128/26 + ipv6_subprefix: -40 + inbound_filtering: true + enforce_client_isolation: true + assignments: + camp2-core: 1 + + - vid: 42 + role: mgmt + prefix: 10.31.0.77/32 + gateway: 1 + dns: 1 + ipv6_subprefix: 0 + assignments: + camp2-core: 1 + + - vid: 50 + role: uplink + untagged: true + ifname: eth1 + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.31.202.69/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.31.202.70/32 + wireguard_port: 51821 diff --git a/locations/camp3.yml b/locations/camp3.yml new file mode 100644 index 000000000..2fa3f2f46 --- /dev/null +++ b/locations/camp3.yml @@ -0,0 +1,69 @@ +--- +location: camp3 +location_nice: campfunk.freifunk.net#3 +latitude: 12.00200 +longitude: 13.00400 +community: true + +hosts: + - hostname: camp3-core + role: corerouter + model: "glinet_gl-mt1300" + wireless_profile: freifunk_default + packages__to_merge: + - "kmod-usb-net-rndis" + - "usb-modeswitch" + +# camp3 +# --MGMT: 10.31.0.137/32 +# --DHCP: 10.31.202.192/26 +# --MESH: 10.31.202.72/30 + +ipv6_prefix: 2001:bf7:750:5900::/56 + +networks: + + - vid: 20 + role: mesh + name: mesh_camp + prefix: 10.31.202.72/32 + ipv6_subprefix: -20 + mesh_ap: camp3-core + mesh_radio: 11a_standard + mesh_iface: mesh + + - vid: 40 + role: dhcp + name: dhcp + prefix: 10.31.202.192/26 + ipv6_subprefix: -40 + inbound_filtering: true + enforce_client_isolation: true + assignments: + camp3-core: 1 + + - vid: 42 + role: mgmt + prefix: 10.31.0.137/32 + gateway: 1 + dns: 1 + ipv6_subprefix: 0 + assignments: + camp3-core: 1 + + - vid: 50 + role: uplink + untagged: true + ifname: eth1 + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.31.202.73/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.31.202.74/32 + wireguard_port: 51821 diff --git a/locations/camp4.yml b/locations/camp4.yml new file mode 100644 index 000000000..3cd8e5d5e --- /dev/null +++ b/locations/camp4.yml @@ -0,0 +1,69 @@ +--- +location: camp4 +location_nice: campfunk.freifunk.net#4 +latitude: 12.00100 +longitude: 13.00300 +community: true + +hosts: + - hostname: camp4-core + role: corerouter + model: "glinet_gl-mt1300" + wireless_profile: freifunk_default + packages__to_merge: + - "kmod-usb-net-rndis" + - "usb-modeswitch" + +# camp4 +# --MGMT: 10.31.0.138/32 +# --DHCP: 10.31.203.0/26 +# --MESH: 10.31.202.76/30 + +ipv6_prefix: 2001:bf7:750:5c00::/56 + +networks: + + - vid: 20 + role: mesh + name: mesh_camp + prefix: 10.31.202.76/32 + ipv6_subprefix: -20 + mesh_ap: camp4-core + mesh_radio: 11a_standard + mesh_iface: mesh + + - vid: 40 + role: dhcp + name: dhcp + prefix: 10.31.203.0/26 + ipv6_subprefix: -40 + inbound_filtering: true + enforce_client_isolation: true + assignments: + camp4-core: 1 + + - vid: 42 + role: mgmt + prefix: 10.31.0.138/32 + gateway: 1 + dns: 1 + ipv6_subprefix: 0 + assignments: + camp4-core: 1 + + - vid: 50 + role: uplink + untagged: true + ifname: eth1 + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.31.202.77/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.31.202.78/32 + wireguard_port: 51821 diff --git a/locations/camp5.yml b/locations/camp5.yml new file mode 100644 index 000000000..710853c66 --- /dev/null +++ b/locations/camp5.yml @@ -0,0 +1,69 @@ +--- +location: camp5 +location_nice: campfunk.freifunk.net#5 +latitude: 12.00100 +longitude: 13.00200 +community: true + +hosts: + - hostname: camp5-core + role: corerouter + model: "glinet_gl-mt1300" + wireless_profile: freifunk_default + packages__to_merge: + - "kmod-usb-net-rndis" + - "usb-modeswitch" + +# camp5 +# --MGMT: 10.31.0.139/32 +# --DHCP: 10.31.203.64/26 +# --MESH: 10.31.202.80/30 + +ipv6_prefix: 2001:bf7:750:5d00::/56 + +networks: + + - vid: 20 + role: mesh + name: mesh_camp + prefix: 10.31.202.80/32 + ipv6_subprefix: -20 + mesh_ap: camp5-core + mesh_radio: 11a_standard + mesh_iface: mesh + + - vid: 40 + role: dhcp + name: dhcp + prefix: 10.31.203.64/26 + ipv6_subprefix: -40 + inbound_filtering: true + enforce_client_isolation: true + assignments: + camp5-core: 1 + + - vid: 42 + role: mgmt + prefix: 10.31.0.139/32 + gateway: 1 + dns: 1 + ipv6_subprefix: 0 + assignments: + camp5-core: 1 + + - vid: 50 + role: uplink + untagged: true + ifname: eth1 + + - role: tunnel + ifname: ts_wg0 + mtu: 1280 + prefix: 10.31.202.81/32 + wireguard_port: 51820 + + - role: tunnel + ifname: ts_wg1 + mtu: 1280 + prefix: 10.31.202.82/32 + wireguard_port: 51821 From 3930bcd5905f5643b9fd0c22e63244e5f4f6a4d6 Mon Sep 17 00:00:00 2001 From: Lino Date: Tue, 21 May 2024 11:05:56 +0200 Subject: [PATCH 2/3] campfunk: add camp-base --- locations/camp-base.yml | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 locations/camp-base.yml diff --git a/locations/camp-base.yml b/locations/camp-base.yml new file mode 100644 index 000000000..7e584190b --- /dev/null +++ b/locations/camp-base.yml @@ -0,0 +1,56 @@ +--- +location: camp-base +location_nice: campfunk.freifunk.net +latitude: 12.00200 +longitude: 13.00100 +community: true + +hosts: + - hostname: camp-base-core + role: corerouter + model: "mikrotik_wap-ac" + wireless_profile: freifunk_default + + - hostname: camp-base-ap1 + role: corerouter + model: "mikrotik_wap-ac" + wireless_profile: freifunk_default + +# camp-base: +# --MGMT: 10.31.203.248/30 +# --DHCP: 10.31.204.64/26 +# --MESH: 10.31.203.252/30 + +ipv6_prefix: 2001:bf7:750:6700::/56 + +networks: + + - vid: 20 + role: mesh + name: mesh_camp + prefix: 10.31.203.252/32 + ipv6_subprefix: -20 + mesh_ap: camp-base-ap1 + mesh_radio: 11a_standard + mesh_iface: mesh + + - vid: 40 + role: dhcp + name: dhcp + prefix: 10.31.204.64/26 + ipv6_subprefix: -40 + inbound_filtering: true + enforce_client_isolation: true + assignments: + camp-base-core: 1 + camp-base-ap1: 2 + + - vid: 42 + role: mgmt + prefix: 10.31.203.248/30 + gateway: 1 + dns: 1 + ipv6_subprefix: 0 + assignments: + camp-base-core: 1 + camp-base-ap1: 2 From 3aa26875359a8c70a35e19ff4102eb1ffe07805b Mon Sep 17 00:00:00 2001 From: Zwei Date: Mon, 16 Dec 2024 17:20:38 +0100 Subject: [PATCH 3/3] camp: model changed --- locations/camp2.yml | 2 +- locations/camp3.yml | 2 +- locations/camp4.yml | 2 +- locations/camp5.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locations/camp2.yml b/locations/camp2.yml index fd0a69d99..f63752bb6 100644 --- a/locations/camp2.yml +++ b/locations/camp2.yml @@ -8,7 +8,7 @@ community: true hosts: - hostname: camp2-core role: corerouter - model: "glinet_gl-mt1300" + model: "mikrotik_wap-ac" wireless_profile: freifunk_default packages__to_merge: - "kmod-usb-net-rndis" diff --git a/locations/camp3.yml b/locations/camp3.yml index 2fa3f2f46..fb6f1ce0f 100644 --- a/locations/camp3.yml +++ b/locations/camp3.yml @@ -8,7 +8,7 @@ community: true hosts: - hostname: camp3-core role: corerouter - model: "glinet_gl-mt1300" + model: "mikrotik_wap-ac" wireless_profile: freifunk_default packages__to_merge: - "kmod-usb-net-rndis" diff --git a/locations/camp4.yml b/locations/camp4.yml index 3cd8e5d5e..c714165bd 100644 --- a/locations/camp4.yml +++ b/locations/camp4.yml @@ -8,7 +8,7 @@ community: true hosts: - hostname: camp4-core role: corerouter - model: "glinet_gl-mt1300" + model: "mikrotik_wap-ac" wireless_profile: freifunk_default packages__to_merge: - "kmod-usb-net-rndis" diff --git a/locations/camp5.yml b/locations/camp5.yml index 710853c66..152359cbc 100644 --- a/locations/camp5.yml +++ b/locations/camp5.yml @@ -8,7 +8,7 @@ community: true hosts: - hostname: camp5-core role: corerouter - model: "glinet_gl-mt1300" + model: "mikrotik_wap-ac" wireless_profile: freifunk_default packages__to_merge: - "kmod-usb-net-rndis"