From e382c9379e58e4ab12814115e344d1eb96a855e0 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Fri, 29 Jul 2016 13:04:39 +0200 Subject: change FAU specific config 1) introduce new FAU install target and move all FAU specific in FAU/ 2) change fish function "start_uni_wlan" to bash script 3) introduce netctl profile for FAU-STUD --- FAU/fau_stud.conf.gpg | Bin 0 -> 833 bytes FAU/start_fau_wlan.sh | 4 ++++ FAU/wl-FAU-STUD.gpg | Bin 0 -> 858 bytes config/fish/functions/start_uni_wlan.fish | 4 ---- fau_stud.conf.gpg | Bin 833 -> 0 bytes setup.py | 9 ++++++--- 6 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 FAU/fau_stud.conf.gpg create mode 100755 FAU/start_fau_wlan.sh create mode 100644 FAU/wl-FAU-STUD.gpg delete mode 100644 config/fish/functions/start_uni_wlan.fish delete mode 100644 fau_stud.conf.gpg diff --git a/FAU/fau_stud.conf.gpg b/FAU/fau_stud.conf.gpg new file mode 100644 index 0000000..fa93ec6 Binary files /dev/null and b/FAU/fau_stud.conf.gpg differ diff --git a/FAU/start_fau_wlan.sh b/FAU/start_fau_wlan.sh new file mode 100755 index 0000000..d60cb60 --- /dev/null +++ b/FAU/start_fau_wlan.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +sudo wpa_supplicant -B -iwlp2s0 -D wext -c /etc/wpa_supplicant/fau_stud.conf +sudo dhcpcd wlp2s0 diff --git a/FAU/wl-FAU-STUD.gpg b/FAU/wl-FAU-STUD.gpg new file mode 100644 index 0000000..ded32bc Binary files /dev/null and b/FAU/wl-FAU-STUD.gpg differ diff --git a/config/fish/functions/start_uni_wlan.fish b/config/fish/functions/start_uni_wlan.fish deleted file mode 100644 index 0d17e69..0000000 --- a/config/fish/functions/start_uni_wlan.fish +++ /dev/null @@ -1,4 +0,0 @@ -function start_uni_wlan --description "starts wpa_supplicant and dhcpcd" - sudo wpa_supplicant -B -iwlp2s0 -D wext -c /etc/wpa_supplicant/fau_stud.conf - sudo dhcpcd wlp2s0 -end diff --git a/fau_stud.conf.gpg b/fau_stud.conf.gpg deleted file mode 100644 index fa93ec6..0000000 Binary files a/fau_stud.conf.gpg and /dev/null differ diff --git a/setup.py b/setup.py index 0b5d32f..76d541d 100755 --- a/setup.py +++ b/setup.py @@ -64,8 +64,7 @@ targets = { "fish-config": [("config/fish/config.fish", home_dir + "/.config/fish/config.fish"), ("config/fish/fishfile", home_dir + "/.config/fish/fishfile"), - fish_config, - ("fau_stud.conf.gpg", "/etc/wpa_supplicant/fau_stud.conf")], + fish_config], "terminator-config": [("config/terminator/config", home_dir + "/.config/terminator/config")], @@ -73,7 +72,11 @@ targets = { [("offlineimap/offlineimaprc", home_dir + "/.offlineimaprc"), ("offlineimap/FAU.IMAP.PASS.gpg", ""), ("offlineimap/offlineimap@.service", - "/etc/systemd/system/offlineimap@.service")] + "/etc/systemd/system/offlineimap@.service")], + "FAU": + [("FAU/wl-FAU-STUD.gpg", "/etc/netctl/wl-FAU-STUD"), + ("FAU/fau_stud.conf.gpg", "/etc/wpa_supplicant/fau_stud.conf"), + ("FAU/start_fau_wlan.sh", home_dir + "/.local/bin/start_fau_wlan")] } git_submodules_for = ["vim.d"] -- cgit v1.2.3