From 45b2aa221aa2a5a85c9e221b5e03256bd0823999 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 29 Dec 2020 01:27:26 +0100 Subject: ws/minet: add more connection scripts --- roles/ws/minet/defaults/main.yml | 5 +++ roles/ws/minet/tasks/main.yml | 8 +++++ roles/ws/minet/templates/connections/0xffWire.j2 | 27 +++++++++++++++ .../ws/minet/templates/connections/0xffWireless.j2 | 32 ++++++++++++++++++ roles/ws/minet/templates/connections/a1Mobile.j2 | 31 ++++++++++++++++++ .../minet/templates/connections/ccc2011Wireless.j2 | 30 +++++++++++++++++ .../ws/minet/templates/connections/ccc2019Wire.j2 | 32 ++++++++++++++++++ roles/ws/minet/templates/connections/dhcpWire.j2 | 3 -- .../minet/templates/connections/elevateDomWire.j2 | 32 ++++++++++++++++++ .../templates/connections/elevateForumWire.j2 | 32 ++++++++++++++++++ .../ws/minet/templates/connections/elevateWire.j2 | 38 ++++++++++++++++++++++ .../templates/connections/genericWPAWireless.j2 | 3 -- .../templates/connections/helsinkiWireless.j2 | 34 +++++++++++++++++++ .../minet/templates/connections/horstWireless.j2 | 25 ++++++++++++++ roles/ws/minet/templates/connections/manualWire.j2 | 3 -- .../minet/templates/connections/manualWireless.j2 | 3 -- roles/ws/minet/templates/connections/pwWire.j2 | 35 ++++++++++++++++++++ .../ws/minet/templates/connections/realraumWire.j2 | 33 +++++++++++++++++++ .../templates/connections/realraumWireless.j2 | 34 +++++++++++++++++++ .../minet/templates/connections/stmkgrueneWire.j2 | 34 +++++++++++++++++++ roles/ws/minet/templates/connections/tugWire.j2 | 24 ++++++++++++++ .../ws/minet/templates/connections/tugWireVpnc.j2 | 28 ++++++++++++++++ .../ws/minet/templates/connections/tugWireless.j2 | 29 +++++++++++++++++ .../minet/templates/connections/westbusWireless.j2 | 27 +++++++++++++++ roles/ws/minet/templates/connections/wifiScan.j2 | 5 +-- roles/ws/minet/templates/wpa-connection.j2 | 29 +++++++++++++++++ 26 files changed, 600 insertions(+), 16 deletions(-) create mode 100755 roles/ws/minet/templates/connections/0xffWire.j2 create mode 100755 roles/ws/minet/templates/connections/0xffWireless.j2 create mode 100755 roles/ws/minet/templates/connections/a1Mobile.j2 create mode 100755 roles/ws/minet/templates/connections/ccc2011Wireless.j2 create mode 100755 roles/ws/minet/templates/connections/ccc2019Wire.j2 create mode 100755 roles/ws/minet/templates/connections/elevateDomWire.j2 create mode 100755 roles/ws/minet/templates/connections/elevateForumWire.j2 create mode 100755 roles/ws/minet/templates/connections/elevateWire.j2 create mode 100755 roles/ws/minet/templates/connections/helsinkiWireless.j2 create mode 100755 roles/ws/minet/templates/connections/horstWireless.j2 create mode 100755 roles/ws/minet/templates/connections/pwWire.j2 create mode 100755 roles/ws/minet/templates/connections/realraumWire.j2 create mode 100755 roles/ws/minet/templates/connections/realraumWireless.j2 create mode 100755 roles/ws/minet/templates/connections/stmkgrueneWire.j2 create mode 100755 roles/ws/minet/templates/connections/tugWire.j2 create mode 100755 roles/ws/minet/templates/connections/tugWireVpnc.j2 create mode 100755 roles/ws/minet/templates/connections/tugWireless.j2 create mode 100755 roles/ws/minet/templates/connections/westbusWireless.j2 create mode 100755 roles/ws/minet/templates/wpa-connection.j2 (limited to 'roles/ws/minet') diff --git a/roles/ws/minet/defaults/main.yml b/roles/ws/minet/defaults/main.yml index f2a25f02..a665b0a5 100644 --- a/roles/ws/minet/defaults/main.yml +++ b/roles/ws/minet/defaults/main.yml @@ -4,3 +4,8 @@ ws_minet_wired_interface_module: e1000e ws_minet_wireless_interface_name: wlan0 ws_minet_wireless_interface_module: iwlwifi + +ws_minet_wpa_connections: {} +# foo: +# description: foo.bar +# ssid: blub diff --git a/roles/ws/minet/tasks/main.yml b/roles/ws/minet/tasks/main.yml index b1c68d7f..efda2816 100644 --- a/roles/ws/minet/tasks/main.yml +++ b/roles/ws/minet/tasks/main.yml @@ -29,3 +29,11 @@ src: "{{ item }}" dest: "/usr/local/lib/minet/{{ item | basename | splitext | first }}" mode: 0755 + +- name: install custom wpa connections + loop: "{{ ws_minet_wpa_connections | dict2items }}" + loop_control: + label: "{{ item.key }} ({{ item.value.description }})" + template: + src: wpa-connection.j2 + dest: "/usr/local/lib/minet/{{ item.key }}" diff --git a/roles/ws/minet/templates/connections/0xffWire.j2 b/roles/ws/minet/templates/connections/0xffWire.j2 new file mode 100755 index 00000000..f24a75f7 --- /dev/null +++ b/roles/ws/minet/templates/connections/0xffWire.j2 @@ -0,0 +1,27 @@ +#!/bin/sh + +SHORT_NAME="0xffwire" +DESC_NAME="Funkfeuer Freenet WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + ifconfig $INTERFACE 10.12.233.11 netmask 255.255.0.0 + olsrd -f /etc/olsrd/olsrd.wire.conf + echo "search graz.funkfeuer.at" > /etc/resolv.conf + echo "nameserver 10.12.0.10" >> /etc/resolv.conf + ;; + stop) + echo "Disconnecting from $DESC_NAME" + killall olsrd + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/0xffWireless.j2 b/roles/ws/minet/templates/connections/0xffWireless.j2 new file mode 100755 index 00000000..4f282b8d --- /dev/null +++ b/roles/ws/minet/templates/connections/0xffWireless.j2 @@ -0,0 +1,32 @@ +#!/bin/sh + +SHORT_NAME="0xffwireless" +DESC_NAME="Funkfeuer Freenet WIRELESS" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + iw reg set AT + iw dev $INTERFACE del + iw phy phy0 interface add $INTERFACE type ibss + ip link set up dev $INTERFACE + iw --debug $INTERFACE ibss join http://graz.funkfeuer.at/v13 2472 CA:00:24:00:C0:13 + ip addr add dev $INTERFACE 10.12.233.11/16 + olsrd -f /etc/olsrd/olsrd.wireless.conf + echo "search graz.funkfeuer.at" > /etc/resolv.conf + echo "nameserver 10.12.0.10" >> /etc/resolv.conf + ;; + stop) + echo "Disconnecting from $DESC_NAME" + killall olsrd + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/a1Mobile.j2 b/roles/ws/minet/templates/connections/a1Mobile.j2 new file mode 100755 index 00000000..205ca791 --- /dev/null +++ b/roles/ws/minet/templates/connections/a1Mobile.j2 @@ -0,0 +1,31 @@ +#!/bin/sh + +SHORT_NAME="a1Mobile" +DESC_NAME="A1 Mobiles Schmalband" +USB_DEV="/dev/mobile" +RFCOMM_DEV="/dev/rfcomm1" +BT_ADDR="38:EC:E4:86:8F:D3" +RFCOMM_CHANNEL=3 + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + if [ -e "$USB_DEV" ]; then + DEV=$USB_DEV + else + /usr/bin/rfcomm -A -E -S bind $RFCOMM_DEV $BT_ADDR $RFCOMM_CHANNEL + DEV=$RFCOMM_DEV + fi + /usr/bin/pon a1.net $DEV + ;; + stop) + echo "Disconnecting from $DESC_NAME" + /usr/bin/poff a1.net + if [ ! -e "$USB_DEV" ]; then + /usr/bin/rfcomm release $RFCOMM_DEV + fi + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/ccc2011Wireless.j2 b/roles/ws/minet/templates/connections/ccc2011Wireless.j2 new file mode 100755 index 00000000..c0c1e8a2 --- /dev/null +++ b/roles/ws/minet/templates/connections/ccc2011Wireless.j2 @@ -0,0 +1,30 @@ +#!/bin/sh + +SHORT_NAME="ccc2011wireless" +DESC_NAME="CCCamp 2011 WIRELESS" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + iwconfig $INTERFACE essid "ccc-2011" mode Managed + sleep 2 + echo 0 > /proc/sys/net/ipv6/conf/$INTERFACE/autoconf + echo 0 > /proc/sys/net/ipv6/conf/$INTERFACE/accept_ra + iwconfig $INTERFACE channel 44 + dhclient $INTERFACE -v -pf /var/run/dhclient.$SHORT_NAME.pid + ;; + stop) + echo "Disconnecting from $DESC_NAME" + kill `cat /var/run/dhclient.$SHORT_NAME.pid` + rm /var/run/dhclient.$SHORT_NAME.pid + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/ccc2019Wire.j2 b/roles/ws/minet/templates/connections/ccc2019Wire.j2 new file mode 100755 index 00000000..51f7fef0 --- /dev/null +++ b/roles/ws/minet/templates/connections/ccc2019Wire.j2 @@ -0,0 +1,32 @@ +#!/bin/sh + +SHORT_NAME="ccc2019wire" +DESC_NAME="cccamp2019 WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + for VLAN in 41 126; do + ip link add link $INTERFACE name $INTERFACE.$VLAN type vlan id $VLAN + ip addr add dev $INTERFACE.$VLAN 192.168.$VLAN.250/24 + ip link set up dev $INTERFACE.$VLAN + done + ip link add link $INTERFACE name $INTERFACE.19 type vlan id 19 + ip link set up dev $INTERFACE.19 + dhclient $INTERFACE.19 -v -pf /var/run/dhclient.$SHORT_NAME.pid + ;; + stop) + echo "Disconnecting from $DESC_NAME" + kill `cat /var/run/dhclient.$SHORT_NAME.pid` + rm /var/run/dhclient.$SHORT_NAME.pid + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/dhcpWire.j2 b/roles/ws/minet/templates/connections/dhcpWire.j2 index 3acee9a7..6afbb8f5 100755 --- a/roles/ws/minet/templates/connections/dhcpWire.j2 +++ b/roles/ws/minet/templates/connections/dhcpWire.j2 @@ -1,7 +1,4 @@ #!/bin/sh -# -# Author: Christian Pointner -# SHORT_NAME="dhcpwire" DESC_NAME="anywhere(dhcp) WIRE" diff --git a/roles/ws/minet/templates/connections/elevateDomWire.j2 b/roles/ws/minet/templates/connections/elevateDomWire.j2 new file mode 100755 index 00000000..4f579df1 --- /dev/null +++ b/roles/ws/minet/templates/connections/elevateDomWire.j2 @@ -0,0 +1,32 @@ +#!/bin/sh + +SHORT_NAME="elevatedomwire" +DESC_NAME="elevate DOM WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + ifconfig $INTERFACE 91.143.110.174 netmask 255.255.255.240 + route add default gw 91.143.110.161 + ip addr add dev $INTERFACE 192.168.84.23/24 + echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv + echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 217.29.144.65" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 217.29.144.66" >> /tmp/$SHORT_NAME.resolv + resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv + rm /tmp/$SHORT_NAME.resolv + ;; + stop) + echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/elevateForumWire.j2 b/roles/ws/minet/templates/connections/elevateForumWire.j2 new file mode 100755 index 00000000..a770bfd8 --- /dev/null +++ b/roles/ws/minet/templates/connections/elevateForumWire.j2 @@ -0,0 +1,32 @@ +#!/bin/sh + +SHORT_NAME="elevateforumwire" +DESC_NAME="elevate Forum WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + ifconfig $INTERFACE 192.168.84.78 netmask 255.255.255.0 + ip addr add dev $INTERFACE 109.73.158.78 + ip route add default via 192.168.84.254 src 109.73.158.78 + echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv + echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 217.29.144.65" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 217.29.144.66" >> /tmp/$SHORT_NAME.resolv + resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv + rm /tmp/$SHORT_NAME.resolv + ;; + stop) + echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/elevateWire.j2 b/roles/ws/minet/templates/connections/elevateWire.j2 new file mode 100755 index 00000000..e907c88d --- /dev/null +++ b/roles/ws/minet/templates/connections/elevateWire.j2 @@ -0,0 +1,38 @@ +#!/bin/sh + +SHORT_NAME="elevatewire" +DESC_NAME="elevate WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + for VLAN in 18 20 23 42 48 73; do + ip link add link $INTERFACE name $INTERFACE.$VLAN type vlan id $VLAN + ip addr add dev $INTERFACE.$VLAN 192.168.$VLAN.250/24 + ip link set up dev $INTERFACE.$VLAN + done + ip link add link $INTERFACE name $INTERFACE.511 type vlan id 511 + ip addr add dev $INTERFACE.511 10.12.241.138/28 + ip link set up dev $INTERFACE.511 + ip route add 10.0.0.0/8 via 10.12.241.142 + ip route add default via 192.168.18.254 + echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv + echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 192.168.18.254" >> /tmp/$SHORT_NAME.resolv + resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv + rm /tmp/$SHORT_NAME.resolv + ;; + stop) + echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/genericWPAWireless.j2 b/roles/ws/minet/templates/connections/genericWPAWireless.j2 index ecc4b2bb..7321511a 100755 --- a/roles/ws/minet/templates/connections/genericWPAWireless.j2 +++ b/roles/ws/minet/templates/connections/genericWPAWireless.j2 @@ -1,7 +1,4 @@ #!/bin/sh -# -# Author: Christian Pointner -# SHORT_NAME="genericwpawireless" DESC_NAME="Generic WPA WIRELESS" diff --git a/roles/ws/minet/templates/connections/helsinkiWireless.j2 b/roles/ws/minet/templates/connections/helsinkiWireless.j2 new file mode 100755 index 00000000..b66c308b --- /dev/null +++ b/roles/ws/minet/templates/connections/helsinkiWireless.j2 @@ -0,0 +1,34 @@ +#!/bin/sh + +SHORT_NAME="helsinkiwireless" +DESC_NAME="helsinki WIRELESS" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" +SSID="helsinki" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + echo 0 > /proc/sys/net/ipv6/conf/$INTERFACE/accept_ra + wpa_supplicant -c/etc/wpa_supplicant.conf -i$INTERFACE -Dnl80211 -B + wpa_select_ssid $INTERFACE "$SSID" + ip link set up dev $INTERFACE + ip addr add dev $INTERFACE 192.168.1.42/24 + ip route add default via 192.168.1.254 +# ip -6 addr add dev $INTERFACE 2a02:3e0:2003:1::42/64 +# ip -6 route add default via 2a02:3e0:2003:1::1 + echo "domain helsinki.at\nnameserver 192.168.1.254" | resolvconf -a $INTERFACE + ;; + stop) + echo "Disconnecting from $DESC_NAME" + killall wpa_supplicant + deactivate_interface $INTERFACE $MODULE_NAME + resolvconf -d $INTERFACE + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/horstWireless.j2 b/roles/ws/minet/templates/connections/horstWireless.j2 new file mode 100755 index 00000000..c6d04b7e --- /dev/null +++ b/roles/ws/minet/templates/connections/horstWireless.j2 @@ -0,0 +1,25 @@ +#!/bin/sh + +SHORT_NAME="horstwireless" +DESC_NAME="horst WIRELESS" +INTERFACE="mon0" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface wlan0 $MODULE_NAME + iw dev wlan0 del + iw phy phy0 interface add $INTERFACE type monitor + xfce4-terminal --maximize -x horst -i $INTERFACE + ;; + stop) + echo "Disconnecting from $DESC_NAME" + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/manualWire.j2 b/roles/ws/minet/templates/connections/manualWire.j2 index 837b4f15..ea609bb1 100755 --- a/roles/ws/minet/templates/connections/manualWire.j2 +++ b/roles/ws/minet/templates/connections/manualWire.j2 @@ -1,7 +1,4 @@ #!/bin/sh -# -# Author: Christian Pointner -# SHORT_NAME="manualwire" DESC_NAME="manual WIRE" diff --git a/roles/ws/minet/templates/connections/manualWireless.j2 b/roles/ws/minet/templates/connections/manualWireless.j2 index 2f0b6dba..9823ef33 100755 --- a/roles/ws/minet/templates/connections/manualWireless.j2 +++ b/roles/ws/minet/templates/connections/manualWireless.j2 @@ -1,7 +1,4 @@ #!/bin/sh -# -# Author: Christian Pointner -# SHORT_NAME="manualwireless" DESC_NAME="manual WIRELESS" diff --git a/roles/ws/minet/templates/connections/pwWire.j2 b/roles/ws/minet/templates/connections/pwWire.j2 new file mode 100755 index 00000000..f3dc6687 --- /dev/null +++ b/roles/ws/minet/templates/connections/pwWire.j2 @@ -0,0 +1,35 @@ +#!/bin/sh + +SHORT_NAME="pwwire" +DESC_NAME="privacyweek WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + for VLAN in 42; do + ip link add link $INTERFACE name $INTERFACE.$VLAN type vlan id $VLAN + ip addr add dev $INTERFACE.$VLAN 192.168.$VLAN.1/24 + ip link set up dev $INTERFACE.$VLAN + done + ip link add link $INTERFACE name $INTERFACE.18 type vlan id 18 + ip addr add dev $INTERFACE.18 192.168.0.11/24 + ip link set up dev $INTERFACE.18 + ip route add default via 192.168.0.1 + echo "nameserver 192.168.0.1" >> /tmp/minet-$SHORT_NAME.resolv + resolvconf -a $INTERFACE < /tmp/minet-$SHORT_NAME.resolv + rm -f /tmp/minet-$SHORT_NAME.resolv + ;; + stop) + echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/realraumWire.j2 b/roles/ws/minet/templates/connections/realraumWire.j2 new file mode 100755 index 00000000..784074c6 --- /dev/null +++ b/roles/ws/minet/templates/connections/realraumWire.j2 @@ -0,0 +1,33 @@ +#!/bin/sh + +SHORT_NAME="realraumwire" +DESC_NAME="realraum WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + ip link set up dev $INTERFACE + ip addr add dev $INTERFACE 89.106.211.60/27 + ip route add default via 89.106.211.33 + ip -6 addr add dev $INTERFACE 2a02:3e0:4000:1::60/64 + ip -6 route add default via 2a02:3e0:4000:1::1 + echo "search realraum.at" > /tmp/$SHORT_NAME.resolv + echo "domain realraum.at" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 89.106.211.33" >> /tmp/$SHORT_NAME.resolv + resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv + rm /tmp/$SHORT_NAME.resolv + ;; + stop) + echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/realraumWireless.j2 b/roles/ws/minet/templates/connections/realraumWireless.j2 new file mode 100755 index 00000000..7322df73 --- /dev/null +++ b/roles/ws/minet/templates/connections/realraumWireless.j2 @@ -0,0 +1,34 @@ +#!/bin/sh + +SHORT_NAME="realraumwireless" +DESC_NAME="realraum WIRELESS" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" +SSID="realraum5" +#SSID="realtest5" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + wpa_supplicant -c/etc/wpa_supplicant.conf -i$INTERFACE -Dnl80211 -B + wpa_select_ssid $INTERFACE "$SSID" + ip link set up dev $INTERFACE + ip addr add dev $INTERFACE 89.106.211.60/27 + ip route add default via 89.106.211.33 + #ip -6 addr add dev $INTERFACE 2a02:3e0:4000:1::60/64 + #ip -6 route add default via 2a02:3e0:4000:1::1 + echo "domain realraum.at\nnameserver 89.106.211.33" | resolvconf -a $INTERFACE + ;; + stop) + echo "Disconnecting from $DESC_NAME" + killall wpa_supplicant + deactivate_interface $INTERFACE $MODULE_NAME + resolvconf -d $INTERFACE + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/stmkgrueneWire.j2 b/roles/ws/minet/templates/connections/stmkgrueneWire.j2 new file mode 100755 index 00000000..71fc16c6 --- /dev/null +++ b/roles/ws/minet/templates/connections/stmkgrueneWire.j2 @@ -0,0 +1,34 @@ +#!/bin/sh + +SHORT_NAME="elevatewire" +DESC_NAME="elevate WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + for VLAN in 18 42; do + ip link add link $INTERFACE name $INTERFACE.$VLAN type vlan id $VLAN + ip addr add dev $INTERFACE.$VLAN 192.168.$VLAN.250/24 + ip link set up dev $INTERFACE.$VLAN + done + ip route add default via 192.168.18.254 + echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv + echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv + echo "nameserver 192.168.18.254" >> /tmp/$SHORT_NAME.resolv + resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv + rm /tmp/$SHORT_NAME.resolv + ;; + stop) + echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/tugWire.j2 b/roles/ws/minet/templates/connections/tugWire.j2 new file mode 100755 index 00000000..3cb70340 --- /dev/null +++ b/roles/ws/minet/templates/connections/tugWire.j2 @@ -0,0 +1,24 @@ +#!/bin/sh + +SHORT_NAME="tugwire" +DESC_NAME="tug WIRE" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + pon tug + ;; + stop) + echo "Disconnecting from $DESC_NAME" + poff tug + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/tugWireVpnc.j2 b/roles/ws/minet/templates/connections/tugWireVpnc.j2 new file mode 100755 index 00000000..1e261313 --- /dev/null +++ b/roles/ws/minet/templates/connections/tugWireVpnc.j2 @@ -0,0 +1,28 @@ +#!/bin/sh + +SHORT_NAME="tugwirevpnc" +DESC_NAME="tug WIRE (vpnc)" +INTERFACE="{{ ws_minet_wired_interface_name }}" +MODULE_NAME="{{ ws_minet_wired_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + dhclient $INTERFACE -v -pf /var/run/dhclient.$SHORT_NAME.pid + vpnc --natt-mode none --pid-file /var/run/vpnc.$SHORT_NAME.pid /etc/vpnc/tug.conf + ;; + stop) + echo "Disconnecting from $DESC_NAME" + kill `cat /var/run/vpnc.$SHORT_NAME.pid` + rm -f /var/run/vpnc.$SHORT_NAME.pid + kill `cat /var/run/dhclient.$SHORT_NAME.pid` + rm -f /var/run/dhclient.$SHORT_NAME.pid + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/tugWireless.j2 b/roles/ws/minet/templates/connections/tugWireless.j2 new file mode 100755 index 00000000..13062375 --- /dev/null +++ b/roles/ws/minet/templates/connections/tugWireless.j2 @@ -0,0 +1,29 @@ +#!/bin/sh + +SHORT_NAME="tugwireless" +DESC_NAME="tug WIRELESS" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + iwconfig $INTERFACE essid "tug" mode Managed + dhclient $INTERFACE -v -pf /var/run/dhclient.$SHORT_NAME.pid + vpnc --natt-mode none --pid-file /var/run/vpnc.$SHORT_NAME.pid /etc/vpnc/tug.conf + ;; + stop) + echo "Disconnecting from $DESC_NAME" + kill `cat /var/run/vpnc.$SHORT_NAME.pid` + rm -f /var/run/vpnc.$SHORT_NAME.pid + kill `cat /var/run/dhclient.$SHORT_NAME.pid` + rm /var/run/dhclient.$SHORT_NAME.pid + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/westbusWireless.j2 b/roles/ws/minet/templates/connections/westbusWireless.j2 new file mode 100755 index 00000000..d40879e7 --- /dev/null +++ b/roles/ws/minet/templates/connections/westbusWireless.j2 @@ -0,0 +1,27 @@ +#!/bin/sh + +SHORT_NAME="westbuswireless" +DESC_NAME="westbus WIRELESS" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + ESSID=`iw $INTERFACE scan | grep "SSID:" | grep "WESTlan" | head -1 | sed 's/^.*SSID: //'` + iw dev $INTERFACE connect "$ESSID" + dhclient $INTERFACE -v -pf /var/run/dhclient.$SHORT_NAME.pid + ;; + stop) + echo "Disconnecting from $DESC_NAME" + deactivate_interface $INTERFACE $MODULE_NAME + kill `cat /var/run/dhclient.$SHORT_NAME.pid` + rm /var/run/dhclient.$SHORT_NAME.pid + ;; + *) + exit 1 + ;; +esac diff --git a/roles/ws/minet/templates/connections/wifiScan.j2 b/roles/ws/minet/templates/connections/wifiScan.j2 index 81580b63..83d6e9f8 100755 --- a/roles/ws/minet/templates/connections/wifiScan.j2 +++ b/roles/ws/minet/templates/connections/wifiScan.j2 @@ -1,7 +1,4 @@ #!/bin/sh -# -# Author: Christian Pointner -# SHORT_NAME="wifiScan" DESC_NAME="do a Wifi Scan" @@ -14,7 +11,7 @@ case "$1" in start|"") echo "$DESC_NAME" activate_interface $INTERFACE $MODULE_NAME - iwlist $INTERFACE scanning | grep -B 5 ESSID + iw $INTERFACE scan | grep -B 9 'SSID:' deactivate_interface $INTERFACE $MODULE_NAME ;; stop) diff --git a/roles/ws/minet/templates/wpa-connection.j2 b/roles/ws/minet/templates/wpa-connection.j2 new file mode 100755 index 00000000..19319d65 --- /dev/null +++ b/roles/ws/minet/templates/wpa-connection.j2 @@ -0,0 +1,29 @@ +#!/bin/sh + +SHORT_NAME="{{ item.key | lower }}" +DESC_NAME="{{ item.value.description }}" +INTERFACE="{{ ws_minet_wireless_interface_name }}" +MODULE_NAME="{{ ws_minet_wireless_interface_module }}" +SSID="{{ item.value.ssid }}" + +. /usr/local/lib/minet/minet_helpers.sh + +case "$1" in + start|"") + echo "Connecting with $DESC_NAME" + activate_interface $INTERFACE $MODULE_NAME + wpa_supplicant -c/etc/wpa_supplicant.conf -i$INTERFACE -Dnl80211 -B + wpa_select_ssid $INTERFACE "$SSID" + dhclient $INTERFACE -v -pf /var/run/dhclient.$SHORT_NAME.pid + ;; + stop) + echo "Disconnecting from $DESC_NAME" + kill `cat /var/run/dhclient.$SHORT_NAME.pid` + rm /var/run/dhclient.$SHORT_NAME.pid + killall wpa_supplicant + deactivate_interface $INTERFACE $MODULE_NAME + ;; + *) + exit 1 + ;; +esac -- cgit v1.2.3