Revert "Merge branch 'master' into 'master'"

This reverts merge request !1

.gitmodules

@@ -4,70 +4,70 @@
 ###############################################################################
 [submodule "environments/production/data"]
 	path = environments/production/data
-	url = git@git.nordwest.freifunk.net:ffnw-puppet/puppet-data.git
+	url = git@git.ffnw.de:ffnw-puppet/puppet-data.git
 [submodule "environments/production/modules/backbone"]
 	path = environments/production/modules/backbone
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-backbone.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-backbone.git
 [submodule "environments/production/modules/batman"]
 	path = environments/production/modules/batman
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-batman.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-batman.git
 [submodule "environments/production/modules/bird"]
 	path = environments/production/modules/bird
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-bird.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-bird.git
 [submodule "environments/production/modules/dhcp"]
 	path = environments/production/modules/dhcp
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-dhcp.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-dhcp.git
 [submodule "environments/production/modules/essentials"]
 	path = environments/production/modules/essentials
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-essentials.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-essentials.git
 [submodule "environments/production/modules/fastd"]
 	path = environments/production/modules/fastd
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-fastd.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-fastd.git
 [submodule "environments/production/modules/ffrl"]
 	path = environments/production/modules/ffrl
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-ffrl.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-ffrl.git
 [submodule "environments/production/modules/gluoncollector"]
 	path = environments/production/modules/gluoncollector
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-gluoncollector.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-gluoncollector.git
 [submodule "environments/production/modules/hood"]
 	path = environments/production/modules/hood
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-hood.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-hood.git
 [submodule "environments/production/modules/ibgp"]
 	path = environments/production/modules/ibgp
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-ibgp.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-ibgp.git
 [submodule "environments/production/modules/icvpn"]
 	path = environments/production/modules/icvpn
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-icvpn.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-icvpn.git
 [submodule "environments/production/modules/network"]
 	path = environments/production/modules/network
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-network.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-network.git
 [submodule "environments/production/modules/router"]
 	path = environments/production/modules/router
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-router.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-router.git
 [submodule "environments/production/modules/user"]
 	path = environments/production/modules/user
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-user.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-user.git
 [submodule "environments/production/modules/grmlzsh"]
 	path = environments/production/modules/grmlzsh
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-grmlzsh.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-grmlzsh.git
 [submodule "environments/production/modules/tunneldigger"]
 	path = environments/production/modules/tunneldigger
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-tunneldigger.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-tunneldigger.git
 [submodule "environments/production/modules/ipcalc"]
 	path = environments/production/modules/ipcalc
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-ipcalc.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-ipcalc.git
 [submodule "environments/production/modules/dnsmasq"]
 	path = environments/production/modules/dnsmasq
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-dnsmasq.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-dnsmasq.git
 [submodule "environments/production/modules/hopglassserver"]
 	path = environments/production/modules/hopglassserver
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-hopglassserver.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-hopglassserver.git
 [submodule "environments/production/modules/nrpe"]
 	path = environments/production/modules/nrpe
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-nrpe.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-nrpe.git
 [submodule "environments/production/modules/resolvconf"]
 	path = environments/production/modules/resolvconf
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-resolvconf.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-resolvconf.git
 [submodule "environments/production/modules/radvd"]
 	path = environments/production/modules/radvd
-	url = https://git.nordwest.freifunk.net/ffnw-puppet/puppet-radvd.git
+	url = https://git.ffnw.de/ffnw-puppet/puppet-radvd.git