diff --git a/Dockerfile b/Dockerfile
index 310a4cb..600d532 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,13 @@
 FROM debian:stretch
 MAINTAINER Cajus Kamer <Cajus.Kamer@arcor.de>
 
-ENV GLUON_TAG_DOCKER_ENV v2018.1.4
-ENV GLUON_RELEASE_DOCKER_ENV 2.1.3
+ENV GLUON_TAG_DOCKER_ENV v2020.1.2
+ENV GLUON_RELEASE_DOCKER_ENV 3.0.0
+ENV GLUON_BROKEN_DOCKER_ENV 1
 
 ENV GLUON_TARGETS_DOCKER_ENV ar71xx-generic ar71xx-nand ar71xx-tiny ar71xx-mikrotik mpc85xx-generic ramips-mt7621 x86-generic x86-64 
-# ENV DOMAINS_TO_BUILD_DOCKER_ENV Domäne-01 Domäne-02 Domäne-03 Domäne-04 Domäne-05 Domäne-06 Domäne-07 Domäne-08 Domäne-09 Domäne-09 Domäne-10 Domäne-11
 
 ENV BUILD_GLUON_DIR_DOCKER_ENV /usr/src/build/gluon
-ENV BUILD_SITE_DIR_DOCKER_ENV /usr/src/build/site
-ENV BUILD_ALL_SITES_DIR_DOCKER_ENV /usr/src/sites
 ENV BUILD_LOG_DIR_DOCKER_ENV /usr/src/build/log
 ENV BUILD_OUTPUT_DIR_DOCKER_ENV /usr/src/build/build
 ENV BUILD_IMAGE_DIR_PREFIX_DOCKER_ENV /data/images.ffdo.de/ffdo_ng/domaenen
@@ -18,7 +16,6 @@ ENV BUILD_IMAGE_DIR_PREFIX_DOCKER_ENV /data/images.ffdo.de/ffdo_ng/domaenen
 ENV TELEGRAM_AUTH_TOKEN_DOCKER_ENV=/usr/src/ChatAuthTokens/telegram.authToken
 ENV TELEGRAM_CHAT_ID_DOCKER_ENV=/usr/src/ChatAuthTokens/telegram.chatID
 
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
@@ -27,18 +24,18 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
 RUN apt-get update
-RUN apt-get -y install --no-install-recommends adduser bash ca-certificates curl python python3 python3-yaml python3-jinja2 wget file git subversion build-essential gawk unzip libncurses5-dev zlib1g-dev openssl libssl-dev bsdmainutils && apt-get clean
+RUN apt-get -y install --no-install-recommends adduser ca-certificates python python3 wget file git subversion build-essential gawk unzip libncurses5-dev zlib1g-dev openssl libssl-dev bsdmainutils && apt-get clean
 
-ADD build_all_lede.sh /usr/src/build_all_lede.sh
-RUN chmod 777 /usr/src/build_all_lede.sh
-ADD ChatAuthTokens /usr/src/ChatAuthTokens
-COPY ChatAuthTokens/* /usr/src/ChatAuthTokens/
+ADD docker-build.py /usr/src/build.py
+ADD site.mk /usr/src/site.mk
+ADD site.conf /usr/src/site.conf
+ADD domains /usr/src/domains
+ADD i18n /usr/src/i18n
 
 RUN adduser --system --home /usr/src/build build
 USER build
 WORKDIR /usr/src/build
-COPY generated/sites /usr/src/sites
 RUN git config --global user.email "technik@freifunk-dortmund.de"
 RUN git config --global user.name "FFDO Gluon Build Container"
 
-CMD ["/bin/bash", "/usr/src/build_all_lede.sh", "-B", "--force-retries", "3"]
+CMD ["/usr/src/build.py"]
\ No newline at end of file
diff --git a/build_all_lede.sh b/build_all_lede.sh
deleted file mode 100644
index cc3d620..0000000
--- a/build_all_lede.sh
+++ /dev/null
@@ -1,539 +0,0 @@
-#!/bin/bash
-
-DEFAULT_GLUON_URL="https://github.com/freifunk-gluon/gluon.git"
-DEFAULT_BUILD_OUTPUT_DIR=${BUILD_OUTPUT_DIR_DOCKER_ENV:-'../build/'}
-DEFAULT_LOG_DIR=${BUILD_LOG_DIR_DOCKER_ENV-'../log/'}
-DEFAULT_GLUON_OUTPUTDIR_PREFIX=$DEFAULT_BUILD_OUTPUT_DIR/${BUILD_IMAGE_DIR_PREFIX_DOCKER_ENV:-'data/images.ffdo.de'}
-DEFAULT_GLUON_SITEDIR=${BUILD_SITE_DIR_DOCKER_ENV:-$(dirname $(pwd))'/site/'}
-DEFAULT_GLUON_DIR=${BUILD_GLUON_DIR_DOCKER_ENV:-'../gluon/'}
-DEFAULT_GLUON_ALL_SITES_DIR=${BUILD_ALL_SITES_DIR_DOCKER_ENV:-$(pwd)'/sites'}
-
-if [ -f HIPCHAT_AUTH_TOKEN ]; then
-	HIPCHAT_NOTIFY_URL="https://hc.infrastruktur.ms/v2/room/34/notification?auth_token=$(cat HIPCHAT_AUTH_TOKEN)" # HIPCHAT_AUTH_TOKEN Muss als Datei im gleichen Ordner wie build_all.sh liegen und den AuthToken für HipChat enthalten.
-else
-	HIPCHAT_NOTIFY_URL=""
-fi
-
-DEFAULT_TELEGRAM_AUTH_TOKEN_FILE=${TELEGRAM_AUTH_TOKEN_DOCKER_ENV:-$(pwd)'/ChatAuthTokens/telegram.authToken'}
-DEFAULT_TELEGRAM_CHAT_ID_FILE=${TELEGRAM_CHAT_ID_DOCKER_ENV:-$(pwd)'/ChatAuthTokens/telegram.chatID'}
-if [ -f $DEFAULT_TELEGRAM_AUTH_TOKEN_FILE ] && [ -f $DEFAULT_TELEGRAM_CHAT_ID_FILE ]; then
-	TELEGRAM_NOTIFY_URL="https://api.telegram.org/bot$(cat $TELEGRAM_AUTH_TOKEN_DOCKER_ENV)/sendMessage" 
-	TELEGRAM_NOTIFY_CHATID=$(cat "$TELEGRAM_CHAT_ID_DOCKER_ENV")
-else
-	TELEGRAM_NOTIFY_URL=""
-	TELEGRAM_NOTIFY_CHATID=""
-fi
-
-GLUON_VERSION=${GLUON_TAG_DOCKER_ENV:-''}
-VERSION=${GLUON_RELEASE_DOCKER_ENV:-''}
-TARGETS_TO_BUILD=""
-CUR_BUILD_TARGET=""
-CORES=""
-MAKE_OPTS=""
-DOMAINS_TO_BUILD=""
-CUR_BUILD_DOMAIN=""
-GLUON_URL=""
-BROKEN=""
-RETRIES=""
-SKIP_GLUON_PREBUILD_ACTIONS=""
-FORCE_DIR_CLEAN=""
-BUILD_OUTPUT_DIR=""
-BUILD_LOG_DIR=""
-imagedir=""
-modulesdir=""
-
-function expand_relativ_path () {
-	echo ${1/../$(dirname $(pwd))}
-}
-
-function create_logfile_name() {
-	action=$1
-	index=$2
-	logfilename=""
-
-	if [[ ! $CUR_BUILD_DOMAIN == "" ]]
-	then
-		logfilename=$logfilename$CUR_BUILD_DOMAIN"-"
-	fi
-	if [[ ! $CUR_BUILD_TARGET == "" ]]
-	then
-		logfilename=$logfilename$CUR_BUILD_TARGET"-"
-	fi
-	logfilename=$logfilename$action
-	if [[ $index -gt 0 ]]
-	then
-		logfilename=$logfilename"-"$index
-	fi
-	logfilename=$logfilename".log"
-	echo "$BUILD_LOG_DIR/$logfilename"
-}
-
-function set_arguments_not_passed () {
-	GLUON_GLUONDIR=${GLUON_GLUONDIR:-$DEFAULT_GLUON_DIR}
-	GLUON_SITEDIR=${GLUON_SITEDIR:-$DEFAULT_GLUON_SITEDIR}
-	GLUON_ALL_SITES_DIR=${GLUON_ALL_SITES_DIR:-$DEFAULT_GLUON_ALL_SITES_DIR}
-	GLUON_OUTPUTDIR_PREFIX=${GLUON_OUTPUTDIR_PREFIX:-$DEFAULT_GLUON_OUTPUTDIR_PREFIX}
-#	CORES=${CORES:-$(grep -ic 'model name' /proc/cpuinfo)}
-	CORES=${CORES:-$(expr $(nproc) + 1)}
-	GLUON_URL=${GLUON_URL:-$DEFAULT_GLUON_URL}
-	RETRIES=${RETRIES:-1}
-	SKIP_GLUON_PREBUILD_ACTIONS=${SKIP_GLUON_PREBUILD_ACTIONS:-0}
-	BUILD_OUTPUT_DIR=${DEFAULT_BUILD_OUTPUT_DIR}
-	BUILD_LOG_DIR=${DEFAULT_LOG_DIR:-'.'}
-
-
-	GLUON_OUTPUTDIR_PREFIX=$(expand_relativ_path "$GLUON_OUTPUTDIR_PREFIX")
-	BUILD_OUTPUT_DIR=$(expand_relativ_path "$BUILD_OUTPUT_DIR")
-	BUILD_LOG_DIR=$(expand_relativ_path "$BUILD_LOG_DIR")
-	GLUON_GLUONDIR=$(expand_relativ_path "$GLUON_GLUONDIR")
-	GLUON_SITEDIR=$(expand_relativ_path "$GLUON_SITEDIR")
-	DEFAULT_GLUON_ALL_SITES_DIR=$(expand_relativ_path "$DEFAULT_GLUON_ALL_SITES_DIR")
-	GLUON_IMAGEDIR=$(expand_relativ_path "$GLUON_IMAGEDIR")
-	FORCE_DIR_CLEAN=${FORCE_DIR_CLEAN:-0}
-}
-
-function split_value_from_argument () {
-	if [[ "${1:1:1}" == '-' ]]
-	then
-	       	if [[ "$1" =~ '=' ]]
-		then
-			echo ${1##*=}
-		else
-			echo $2
-			return 1
-		fi
-	else
-		if [[ "${#1}" == 2 ]]
-		then
-			echo $2
-			return 1
-		else
-			echo ${1:2}
-		fi
-	fi
-	return 0
-}
-
-function notify () {
-	COLOR=$1
-	MESSAGE=$2
-	NOTIFY=$3
-	NC='\033[0m' # No Color
-	case "$COLOR" in 
-		red)
-			CCODE="\033[31m"
-			;;
-		yellow)
-			CCODE="\033[33m"
-			;;
-		purple)
-			CCODE="\033[95m" # ok, bright magenta. Near enough
-			;;
-		green)
-			CCODE="\033[32m"
-			;;
-		blue)
-			CCODE="\033[34m"
-			;;
-		*)
-			CCODE=""
-			NC=""
-			;;
-	esac
-	echo -e "${CCODE}${MESSAGE}${NC}"
-	if [ ! -z "$HIPCHAT_NOTIFY_URL" ]; then
-		curl -d '{"color":"'"$COLOR"'","message":"'"$(hostname) --> $MESSAGE"'","notify":"'"$NOTIFY"'","message_format":"text"}' -H 'Content-Type: application/json' $HIPCHAT_NOTIFY_URL
-	fi
-	if [ ! -z "$TELEGRAM_NOTIFY_URL" ]; then
-		curl --max-time 10 -s -d "chat_id=$TELEGRAM_NOTIFY_CHATID&text=$MESSAGE" $TELEGRAM_NOTIFY_URL &>/dev/null
-	fi
-}
-
-function enable_debugging () {
-	set -x
-}
-
-function add_domain_to_buildprocess () {
-	if [[ $DOMAINS_TO_BUILD == "" ]]
-	then 
-		DOMAINS_TO_BUILD="$1"
-	else
-		DOMAINS_TO_BUILD="$DOMAINS_TO_BUILD $1"
-	fi
-}
-
-function add_target_to_buildprocess () {
-	TARGETS_TO_BUILD="$TARGETS_TO_BUILD $1"
-}
-
-function process_arguments () {
-	while [[ $# -gt 0 ]]
-	do
-		arg=$1
-		if [[ "${1:0:1}" == "-" ]]
-		then
-			value=`split_value_from_argument $1 $2`
-			if [[ $? == 1 ]] 
-			then
-				shift
-			fi
-		else
-			value=$1
-		fi
-		case "$arg" in
-			-j*|--cores*)
-				if [[ $value =~ ^-?[0-9]+$ ]]
-				then
-					CORES=$value
-				else
-					echo "Number of cores is not an integer. Aborting."
-					echo
-					display_usage
-				fi
-				shift
-				;;
-			-g*|--gluon-dir*)
-				GLUON_GLUONDIR=$value
-				shift
-				;;
-			-s*|--site-dir*)
-				GLUON_SITEDIR=$value
-				shift
-				;;
-			-l*|--log-dir*)
-				BUILD_LOG_DIR=$value
-				shift
-				;;
-			-o*|--output-prefix*)
-				GLUON_OUTPUTDIR_PREFIX=$value
-				shift
-				;;
-			--gluon-url*)
-				GLUON_URL=$value
-				shift
-				;;
-			-D|--enable-debugging)
-				enable_debugging
-				;;
-			-f|--force-dir-clean)
-				FORCE_DIR_CLEAN=1
-				;;
-			-B|--enable-broken)
-				BROKEN="BROKEN=1"
-				;;
-			-S|--skip-gluon-prebuilds)
-				SKIP_GLUON_PREBUILD_ACTIONS=1
-				;;
-			-d*|--domain*)
-				add_domain_to_buildprocess $value
-				shift
-				;;
-			-t*|--target*)
-				add_target_to_buildprocess $value
-				shift
-				;;
-			-f*|--force-retries*)
-				if [[ $value =~ ^-?[0-9]+$ ]]
-				then
-					RETRIES=$value
-				else
-					echo "Number of retries is not an integer. Aborting."
-					echo
-					display_usage
-				fi
-				shift
-				;;
-			*)
-				if [[ $GLUON_VERSION == "" ]]
-				then
-					GLUON_VERSION=$value
-				elif [[ $VERSION == "" ]]
-				then
-					VERSION=$value
-				else
-					echo "Unparsable parameter. Aborting."
-					echo
-					display_usage
-				fi
-				shift
-				;;
-		esac
-	done
-	if [[ $GLUON_VERSION == "" || $VERSION == "" ]]
-	then
-		display_usage
-	fi
-	set_arguments_not_passed
-}
-
-function build_make_opts () {
-
-	MAKE_OPTS="-C $GLUON_GLUONDIR GLUON_RELEASE=$VERSION GLUON_SITEDIR=$GLUON_SITEDIR V=s $BROKEN FORCE_UNSAFE_CONFIGURE=1"
-}
-
-function is_git_repo () {
-	git -C "$1" status 2&> /dev/null
-	if [ $? != 0 ]
-	then
-		echo "The folder \"$1\" is not a valid git repository, delete it or select another destination and restart the script."
-		exit 1
-	fi
-	return 0
-}
-
-function display_usage () {
-echo 'Usage: $0 [PARAMETERS] GLUON_RELEASE_TAG VERSION_NUMBER
-
-Parameters:
-
-All parameters can be set in one of the following ways: -e <value>, -e<value>, --example <value>, --exmaple==<value>
-
-	-j --cores: Number of cores to use. If left empty, all cores will be used.
-
-	-g --gluon-dir: Path to Gluon-Git-Folder. Default is "../gluon".
-	-s --site-dir: Path to the site config. Default is "../site".
-	-l --log-dir: Path to save build logging.  Default is "../log".
-	-o --output-prefix: Prefix for output folder, default is "/var/www/html".
-	--gluon-url: URL to Gluon repository, default is "https://github.com/freifunk-gluon/gluon.git".
-	-D --enable-debugging: Enables debugging by setting "set -x". This must be the first parameter, if you want to debug the parameter parsing.
-	-B --enable-broken: Enable the building of broken targets and broken images.
-	-S --skip-gluon-prebuilds: Skip make dirclean of Gluon folder. 
-	-d --domain: Branches of your site-Git-repository to build. If left empty, all Domäne-XX will be build. This parameter can be used multiple times or you can set multiple branches at once, seperated by space and in quotes: "branch1 branch2 branch3".
-	-t*|--target: Targets to build. If left empty, all targets will be build. If broken is set, even those will be build. This parameter can be used multiple times or you can set multiple targets at once, seperated by space and in quotes: "target1 target2 target3".
-	-f --force-dir-clean: Force a make dir clean after each target.
-
-
-Please report issues here: 
-	https://github.com/ffdo/site-ffdo-l2tp/issues
-	https://github.com/FreiFunkMuenster/tools/issues
-
-License: GPLv3, Author: Matthias Walther'
-	exit 1
-}
-
-running_in_docker () {
-  (awk -F/ '$2 == "docker"' /proc/self/cgroup | read non_empty_input)
-}
-
-function is_folder () {
-	[[ -d $1 ]] && return 0 || return 1
-}
-
-function git_fetch () {
-	git -C "$1" fetch
-}
-
-function git_checkout () {
-	command="git -C \"$1\" checkout $2"
-	title="git-checkout-"$(basename "$1")"-$2"
-	try_execution_x_times $RETRIES "$title" "$command"
-}
-
-function git_pull () {
-	git -C "$1" pull
-}
-
-function set_sitedir() {
-# 	mkdir "$GLUON_SITEDIR"
-	if is_folder "$GLUON_SITEDIR"
-	then
-		rm -rf "$GLUON_SITEDIR"
-	fi	
-	mkdir "$GLUON_SITEDIR"
-	cp -r "$DEFAULT_GLUON_ALL_SITES_DIR/$1"/* "$GLUON_SITEDIR/"
-}
-
-function prepare_repo () {
-	if is_folder "$1" && is_git_repo "$1"
-	then
-		git_fetch "$1"
-	else
-		git clone $2 "$1"
-	fi
-}
-
-function force_dir_clean () {
-	command="make dirclean $MAKE_OPTS"
-	try_execution_x_times $RETRIES "make-dirclean" "$command"
-}
-
-function gluon_prepare_buildprocess () {
-	command="make update ${MAKE_OPTS}"
-	try_execution_x_times $RETRIES "make-update" "$command"
-	if [[ $FORCE_DIR_CLEAN=="1" ]]
-	then
-		force_dir_clean
-	fi
-	check_targets
-	for target in $TARGETS_TO_BUILD
-	do
-		command="make clean $MAKE_OPTS -j$CORES GLUON_TARGET=$target GLUON_IMAGEDIR=$imagedir"
-		try_execution_x_times $RETRIES "make-clean" "$command"
-	done
-	mkdir -p "$GLUON_GLUONDIR/tmp"
-	mkdir tmp
-}
-
-function get_all_targets_from_gluon_repo () {
-	echo `make $MAKE_OPTS GLUON_TARGET= 2> /dev/null |grep -v 'Please\|make\|Makefile'|sed -e 's/.* \* //g'`
-}
-
-function check_targets () {
-	if [[ $TARGETS_TO_BUILD == "" ]]
-	then
-		if [[ $GLUON_TARGETS_DOCKER_ENV == "" ]]
-		then
-			TARGETS_TO_BUILD=$(get_all_targets_from_gluon_repo)
-		else
-			TARGETS_TO_BUILD=$GLUON_TARGETS_DOCKER_ENV
-		fi
-	fi
-}
-
-function create_checksumfile_in_dir () {
-	chks_dir=$(expand_relativ_path "$1")
-	if is_folder "$chks_dir"
-	then 
-		echo "$CUR_BUILD_DOMAIN: Creating SHA512 sums in: "$(basename "$chks_dir")
-		MYPWD=$(pwd)
-		cd "$chks_dir"
-		sha512sum * > ./sha512sum.txt
-		cd $MYPWD
-	else 
-		echo "Creating SHA512 sums: Directory $chks_dir does not exist."
-	fi
-}
-
-function check_domains () {
-	if [[ $DOMAINS_TO_BUILD == "" ]]
-	then
-		if [[ $DOMAINS_TO_BUILD_DOCKER_ENV == "" ]]
-		then
-			for entry in "$GLUON_ALL_SITES_DIR"/*
-			do
-				add_domain_to_buildprocess "$(basename "$entry")"
-			done
-		else 
-			DOMAINS_TO_BUILD=$DOMAINS_TO_BUILD_DOCKER_ENV
-		fi
-	fi
-}
-
-function try_execution_x_times () {
-	tries_left=$1
-	shift
-    log_title=$1
-    shift
-	return_value=1
-	index=0
-	while [[ $return_value != 0 && $tries_left -gt 0 ]]
-	do
-		let tries_left-=1
-		logfile=$(create_logfile_name "$log_title" $index)
-		echo "$@" | (bash &>> "$logfile")
-		let index+=1
-		return_value=$?
-	done
-	if [[ ! $return_value == 0 ]]
-	then
-		notify "red" "Build abgebrochen." true
-		echo "Something went wrong. Aborting."
-		exit 1
-	fi
-}
-
-function build_target_for_domaene () {
-	command="make $MAKE_OPTS -j$CORES GLUON_BRANCH=stable GLUON_TARGET=$1 GLUON_IMAGEDIR=\"$imagedir\""
-	try_execution_x_times $RETRIES "make-build" "$command"
-}
-
-function make_manifests () {
-	logfile=$(create_logfile_name "make-manifest" 0)
-	( make manifest $MAKE_OPTS GLUON_BRANCH=experimental GLUON_PRIORITY=0 GLUON_IMAGEDIR="$imagedir";
-		make manifest $MAKE_OPTS GLUON_BRANCH=beta GLUON_PRIORITY=0 GLUON_IMAGEDIR="$imagedir"
-		make manifest $MAKE_OPTS GLUON_BRANCH=stable GLUON_PRIORITY=0 GLUON_IMAGEDIR="$imagedir" ) > "$logfile"
-}
-
-
-function build_selected_targets_for_domaene () {
-	prefix=`echo $1|sed -e 's/Domäne-/domaene/'`
-	imagedir="$GLUON_OUTPUTDIR_PREFIX"/"$prefix"/releases/$VERSION/images
-	modulesdir="$GLUON_OUTPUTDIR_PREFIX"/"$prefix"/releases/$VERSION/modules
-	mkdir -p "$imagedir"
-#	mkdir -p "$modulesdir"
-	set_sitedir "$1"
-	
-	for CUR_BUILD_TARGET in $TARGETS_TO_BUILD
-	do
-		if [[ $DO_CLEAN_BEFORE_BUILD == "1" ]]
-		then
-			notify "yellow" "$CUR_BUILD_DOMAIN Target $CUR_BUILD_TARGET säubern." false
-			make clean $MAKE_OPTS GLUON_BRANCH=stable GLUON_TARGET=$CUR_BUILD_TARGET 
-		fi
-		notify "yellow" "$CUR_BUILD_DOMAIN Target $CUR_BUILD_TARGET gestartet." false
-		build_target_for_domaene $CUR_BUILD_TARGET
-		notify "yellow" "$CUR_BUILD_DOMAIN Target $CUR_BUILD_TARGET fertig." false
-	done
-	
-	CUR_BUILD_TARGET=""
-	create_checksumfile_in_dir "$imagedir"/factory
-	create_checksumfile_in_dir "$imagedir"/sysupgrade
-# TODO:
-#   split target name into "base - variation": 'x86-64';
-#   use them as subfolder names.
-#	create_checksumfile_in_dir "$modulesdir"/
-	make_manifests
-}
-
-function build_selected_domains_and_selected_targets () {
-	DO_CLEAN_BEFORE_BUILD=0
-	for CUR_BUILD_DOMAIN in $DOMAINS_TO_BUILD
-	do
-		notify "purple" "$CUR_BUILD_DOMAIN gestartet." false
-		build_selected_targets_for_domaene $CUR_BUILD_DOMAIN
-		notify "purple" "$CUR_BUILD_DOMAIN fertig." false
-		DO_CLEAN_BEFORE_BUILD=0
-	done
-	CUR_BUILD_DOMAIN=""
-}
-
-
-
-process_arguments "$@"
-notify "green" "Build Firmware Version $VERSION ($GLUON_VERSION) gestartet." true
-if running_in_docker 
-then 
-	notify "green" "docker cp $HOSTNAME:$BUILD_LOG_DIR <destination>" true
-	notify "green" "Während des Bauens kannst du die Logdateien aus dem Container kopieren mit:\ndocker cp $HOSTNAME:$BUILD_LOG_DIR <destination>" true
-fi
-
-build_make_opts
-mkdir -p "$BUILD_LOG_DIR" &>/dev/null
-
-check_domains
-
-mkdir "$GLUON_SITEDIR"
-prepare_repo "$GLUON_GLUONDIR" $GLUON_URL
-git_checkout "$GLUON_GLUONDIR" $GLUON_VERSION
-
-arr=($DOMAINS_TO_BUILD)	
-set_sitedir "${arr[0]}"
-
-check_domains
-
-if [[ ! $DOMAINS_TO_BUILD == "" ]]
-then
-	if [[ $SKIP_GLUON_PREBUILD_ACTIONS == 0 ]]
-	then
-		gluon_prepare_buildprocess
-	fi
-	build_selected_domains_and_selected_targets
-	notify "green" "Build Firmware Version $VERSION ($GLUON_VERSION) abgeschlossen." true
-	if running_in_docker 
-	then 
-		force_dir_clean # frees some bytes 
-		notify "green" "Du kannst die Logdateien aus dem Container kopieren mit: \n docker cp $HOSTNAME:$BUILD_LOG_DIR <destination>" true
-		notify "green" "Du kannst die Firmware Images aus dem Container kopieren mit: \n docker cp $HOSTNAME:$BUILD_OUTPUT_DIR <destination>" true
-	fi
-fi
-
diff --git a/create_sitedir.py b/create_sitedir.py
deleted file mode 100755
index ff30639..0000000
--- a/create_sitedir.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import shutil
-import os
-import logging
-import yaml
-from jinja2 import Environment, FileSystemLoader
-from pathlib import Path
-
-def init_output_dir(common_dir, output_dir):
-    logging.info("Deleting output folder '{}', if it exists".format(output_dir))
-    shutil.rmtree(output_dir, ignore_errors = True)
-    logging.info("Copying the common folder '{}' into the newly created output folder '{}'".format(common_dir, output_dir))
-    # the destination directory must not exist here
-    shutil.copytree(common_dir, output_dir)
-
-def write_site_files(template_dir, domain_config, output_dir):
-    logging.info("Populating templates from '{}' and writing it into '{}'".format(template_dir, output_dir))
-    env = Environment(loader=FileSystemLoader(template_dir))
-    template_paths = Path(template_dir).glob('**/*')
-    for template_path in template_paths:
-        template_file = str(template_path.relative_to(template_dir))
-        logging.info("Applying data to template '{}'".format(template_file))
-        template = env.get_template(template_file)
-        template.stream(domain_config).dump(os.path.join(output_dir, template_file))
-
-def get_domain_config(domain_file):
-    logging.info("Loading domain config file '{}'".format(domain_file))
-    with open(domain_file) as f:
-        data = yaml.load(f)
-    return data
-
-def main(args):
-    init_output_dir(args.common_dir, args.output_dir)
-    domain_config = get_domain_config(args.domain_file)
-    write_site_files(args.template_dir, domain_config, args.output_dir)
-
-if __name__ == "__main__":
-    #logging.basicConfig(level=logging.DEBUG)
-    parser = argparse.ArgumentParser()
-    parser.add_argument("template_dir", help="The directory containing the templates")
-    parser.add_argument("common_dir", help="The directory containing the common (unchanged) files")
-    parser.add_argument("domain_file", help="The file containing the domain settings")
-    parser.add_argument("output_dir", help="The ouptput directory")
-    args = parser.parse_args()
-    main(args)
diff --git a/docker-build.py b/docker-build.py
new file mode 100755
index 0000000..da46b86
--- /dev/null
+++ b/docker-build.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env python3
+
+from os import environ, makedirs, chdir, listdir, rename
+from os.path import isdir, exists
+from subprocess import call, check_call
+from shutil import *
+from multiprocessing import cpu_count
+from datetime import datetime
+from sys import stdout
+
+release = environ['GLUON_RELEASE_DOCKER_ENV']
+branch = environ['GLUON_TAG_DOCKER_ENV']
+broken = environ['GLUON_BROKEN_DOCKER_ENV']
+
+home = '/usr/src/build'
+
+gluondir = '%s/gluon' % home
+
+outdir = '%s/output/%s' % (home, release)
+logdir = '%s/log' % outdir
+
+siteconf = '/usr/src/site.conf'
+sitemk = '/usr/src/site.mk'
+domainsdir = '/usr/src/domains'
+i18ndir = '/usr/src/i18n'
+
+factorydir = '%s/images/factory' % outdir
+sysupdir = '%s/images/sysupgrade' % outdir
+modulesdir = '%s/modules' % outdir
+
+makedirs(factorydir)
+makedirs(sysupdir)
+makedirs(modulesdir)
+makedirs(logdir)
+
+start = datetime.now()
+
+def format_duration(d):
+    s = d.total_seconds()
+    return '%.2dh%.2dm%06.3fs' % (s//3600, (s//60)%60, s%60)
+
+# Clone Gluon
+if isdir(gluondir):
+    rmtree(gluondir)
+
+print('Cloning Gluon... ', end=''); stdout.flush()
+with open('%s/git.log' % logdir, 'w') as log:
+    check_call('git clone https://github.com/freifunk-gluon/gluon.git %s -b "%s"' % (gluondir, branch), stdout=log, stderr=log, shell=True)
+print('OK'); stdout.flush()
+
+# Add site configuration
+sitedir = '%s/site' % gluondir
+makedirs(sitedir)
+copy(siteconf, sitedir)
+copy(sitemk, sitedir)
+copytree(i18ndir, '%s/i18n' % sitedir)
+copytree(domainsdir, '%s/domains' % sitedir)
+
+# Prepare
+chdir(gluondir)
+print('Updating other repositories... ', end=''); stdout.flush()
+with open('%s/update.log' % logdir, 'w') as log:
+    check_call('make update V=s', stdout=log, stderr=log, shell=True)
+print('OK'); stdout.flush()
+
+# Choose targets to build
+if 'GLUON_TARGETS_DOCKER_ENV' in environ:
+    targets = environ['GLUON_TARGETS_DOCKER_ENV'].split()
+else:
+    targets = [f for f in listdir('targets') if isdir('targets/%s' % f)]
+
+# Build
+for target in targets:
+    print('You can copy the log file from the container using: docker cp %s:%s/%s_stderr.log <destination>'% (environ['HOSTNAME'], logdir, target)); stdout.flush()
+    print('Building for target %s... ' % target, end=''); stdout.flush()
+    arch, variant = target.split('-')
+    target_start = datetime.now()
+
+    with open('%s/%s_stdout.log' % (logdir, target), 'w') as logout, open('%s/%s_stderr.log' % (logdir, target), 'w') as logerr:
+        rc = call('make -j %s GLUON_BRANCH=%s BROKEN=%s GLUON_TARGET=%s V=s' % (cpu_count()+1, branch, broken, target), stdout=logout, stderr=logerr, shell=True)
+    duration = format_duration(datetime.now() - target_start)
+    if rc == 0:
+        print('OK in', duration)
+
+        # Create manifest
+        print('Creating manifest... ', end=''); stdout.flush()
+        with open('%s/%s_manifest.log' % (logdir, target), 'w') as log:
+            rc = call('make manifest GLUON_BRANCH=%s BROKEN=%s GLUON_TARGET=%s V=s' % (branch, broken, target), stdout=log, stderr=log, shell=True)
+        if rc == 0:
+            rename('output/images/sysupgrade/%s.manifest' % branch, 'output/images/sysupgrade/%s.%s.manifest' % (target, branch))
+            print('OK')
+        else:
+            print('FAILED')
+        stdout.flush()
+
+        # Move images to output
+        for f in listdir('output/images/factory'):
+            rename('output/images/factory/%s' % f, '%s/%s' % (factorydir, f))
+        for f in listdir('output/images/sysupgrade'):
+            rename('output/images/sysupgrade/%s' % f, '%s/%s' % (sysupdir, f))
+
+        # Move modules to output
+        # Since lede modules are optional for some targets
+        modulesbuilddir = 'output/packages/gluon-%s/%s/%s' % (release, arch, variant)
+        if exists(modulesbuilddir):
+            try:
+                makedirs('%s/%s' % (modulesdir, arch))
+            except FileExistsError:
+                pass
+            variantdir = '%s/%s/%s' % (modulesdir, arch, variant)
+            rename('output/packages/gluon-%s/%s/%s' % (release, arch, variant), variantdir)
+
+            # Checksum modules
+            print('Creating SHA512 sums for modules... ', end=''); stdout.flush()
+            chdir(variantdir)
+            check_call('sha512sum * > sha512sum.txt', shell=True)
+            chdir(gluondir)
+        else:
+            print('No modules found for target %s....OK' % target)
+    else:
+        print('FAILED after', duration)
+
+    # Clean up
+    chdir(gluondir)
+    print('Cleaning up...', end=''); stdout.flush()
+    with open('%s/%s_cleanup.log' % (logdir, target), 'w') as log:
+        print('Cleaning up...', end=''); stdout.flush()
+    with open('%s/%s_cleanup.log' % (logdir, target), 'w') as log:
+        # rc = call('make dirclean V=s', stdout=log, stderr=log, shell=True) # clean all
+        rc = call('make clean GLUON_TARGET=%s V=s' % (target), stdout=log, stderr=log, shell=True) # clean target specific 
+    if rc == 0:
+        print('OK')
+    else:
+        print('FAILED')
+    stdout.flush()
+
+print('Creating SHA512 sums for images... ', end=''); stdout.flush()
+for d in (factorydir, sysupdir):
+    chdir(d)
+    check_call('sha512sum * > sha512sum.txt', shell=True)
+print('OK')
+
+print('''
+BUILD FINISHED in %s
+
+You can copy the resulting images from the container using:
+docker cp %s:/usr/src/build/output <destination>
+'''% (format_duration(datetime.now() - start), environ['HOSTNAME']))
+
diff --git a/domains/ffdo_dom01.conf b/domains/ffdo_dom01.conf
new file mode 100644
index 0000000..bb3dcec
--- /dev/null
+++ b/domains/ffdo_dom01.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom01 = 'Freifunk Dortmund - Domäne 01 - Test und Dev',
+    },
+	domain_seed = 'eb3dcef920c7ac9b3c8bba69a137fcf88ad5d4dc2f97ff1c2f9f1ab2bb944eb7',
+
+	prefix4 = '10.01.0.0/16',
+	prefix6 = '2a03:2260:300a:0001::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-01-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-01-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.01.255.254',
+		ip6 = '2a03:2260:300a:0001::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20001',
+				'snng-dtm02.ffdo.de:20001',
+				'snng-ber01.ffdo.de:20001',
+				'snng-ber02.ffdo.de:20001',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom02.conf b/domains/ffdo_dom02.conf
new file mode 100644
index 0000000..9b22844
--- /dev/null
+++ b/domains/ffdo_dom02.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom02 = 'Freifunk Dortmund - Domäne 02 - Außenbezirke',
+    },
+	domain_seed = '9bfb5d60aade652b8a1f7d7fa46c51b291dba4ef6ba03e5f46d8d4cef23ae00a',
+
+	prefix4 = '10.02.0.0/16',
+	prefix6 = '2a03:2260:300a:0002::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-02-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-02-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.02.255.254',
+		ip6 = '2a03:2260:300a:0002::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20002',
+				'snng-dtm02.ffdo.de:20002',
+				'snng-ber01.ffdo.de:20002',
+				'snng-ber02.ffdo.de:20002',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom03.conf b/domains/ffdo_dom03.conf
new file mode 100644
index 0000000..7958d35
--- /dev/null
+++ b/domains/ffdo_dom03.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom03 = 'Freifunk Dortmund - Domäne 03 - Dortmund 1',
+    },
+	domain_seed = '72d1940c9f77860ac1ca8b5778ab9e82e60194f80e35ff76033df2fa610efe3b',
+
+	prefix4 = '10.03.0.0/16',
+	prefix6 = '2a03:2260:300a:0003::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-03-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-03-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.03.255.254',
+		ip6 = '2a03:2260:300a:0003::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20003',
+				'snng-dtm02.ffdo.de:20003',
+				'snng-ber01.ffdo.de:20003',
+				'snng-ber02.ffdo.de:20003',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom04.conf b/domains/ffdo_dom04.conf
new file mode 100644
index 0000000..bd465f8
--- /dev/null
+++ b/domains/ffdo_dom04.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom04 = 'Freifunk Dortmund - Domäne 04 - Dortmund 2',
+    },
+	domain_seed = '2941072831dc0e652118d9fe8ed20be1c8919d1711d4cc2896f8340c2ca51873',
+
+	prefix4 = '10.04.0.0/16',
+	prefix6 = '2a03:2260:300a:0004::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-04-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-04-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.04.255.254',
+		ip6 = '2a03:2260:300a:0004::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20004',
+				'snng-dtm02.ffdo.de:20004',
+				'snng-ber01.ffdo.de:20004',
+				'snng-ber02.ffdo.de:20004',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom05.conf b/domains/ffdo_dom05.conf
new file mode 100644
index 0000000..fe31d57
--- /dev/null
+++ b/domains/ffdo_dom05.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom05 = 'Freifunk Dortmund - Domäne 05 - Dortmund 3',
+    },
+	domain_seed = 'b87c485d1aba7790fb402ce9bb6e237c6cd42c7cdd8dfb7cfbe3a37ec0c843d4',
+
+	prefix4 = '10.05.0.0/16',
+	prefix6 = '2a03:2260:300a:0005::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-05-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-05-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.05.255.254',
+		ip6 = '2a03:2260:300a:0005::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20005',
+				'snng-dtm02.ffdo.de:20005',
+				'snng-ber01.ffdo.de:20005',
+				'snng-ber02.ffdo.de:20005',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom06.conf b/domains/ffdo_dom06.conf
new file mode 100644
index 0000000..6d1a407
--- /dev/null
+++ b/domains/ffdo_dom06.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom06 = 'Freifunk Dortmund - Domäne 06 - Dortmund 4',
+    },
+	domain_seed = '2b575b88cb01d7ef137a8e12b0387d56f104d679c756bc9480ddfd1d055e135b',
+
+	prefix4 = '10.06.0.0/16',
+	prefix6 = '2a03:2260:300a:0006::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-06-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-06-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.06.255.254',
+		ip6 = '2a03:2260:300a:0006::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20006',
+				'snng-dtm02.ffdo.de:20006',
+				'snng-ber01.ffdo.de:20006',
+				'snng-ber02.ffdo.de:20006',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom07.conf b/domains/ffdo_dom07.conf
new file mode 100644
index 0000000..5cc656a
--- /dev/null
+++ b/domains/ffdo_dom07.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom07 = 'Freifunk Dortmund - Domäne 07 - Werne',
+    },
+	domain_seed = 'bb9eec48817c07905004de4284a700f16b9370773e143acce4dd241bbcd423d0',
+
+	prefix4 = '10.07.0.0/16',
+	prefix6 = '2a03:2260:300a:0007::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-07-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-07-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.07.255.254',
+		ip6 = '2a03:2260:300a:0007::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20007',
+				'snng-dtm02.ffdo.de:20007',
+				'snng-ber01.ffdo.de:20007',
+				'snng-ber02.ffdo.de:20007',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom08.conf b/domains/ffdo_dom08.conf
new file mode 100644
index 0000000..dd798ce
--- /dev/null
+++ b/domains/ffdo_dom08.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom08 = 'Freifunk Dortmund - Domäne 08 - Lünen',
+    },
+	domain_seed = 'aa7fd7cbaee103d5d55845e9ff29f38fdfc115924b9a5e981097172b000390c6',
+
+	prefix4 = '10.08.0.0/16',
+	prefix6 = '2a03:2260:300a:0008::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-08-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-08-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.08.255.254',
+		ip6 = '2a03:2260:300a:0008::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20008',
+				'snng-dtm02.ffdo.de:20008',
+				'snng-ber01.ffdo.de:20008',
+				'snng-ber02.ffdo.de:20008',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom09.conf b/domains/ffdo_dom09.conf
new file mode 100644
index 0000000..bb46a74
--- /dev/null
+++ b/domains/ffdo_dom09.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom09 = 'Freifunk Dortmund - Domäne 09 - Bergkamen, Kamen, Bönen',
+    },
+	domain_seed = 'a9c40bac755e5317724164738e822775097a34ee7a417fbd3aa544b391f03fa1',
+
+	prefix4 = '10.09.0.0/16',
+	prefix6 = '2a03:2260:300a:0009::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-09-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-09-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.09.255.254',
+		ip6 = '2a03:2260:300a:0009::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20009',
+				'snng-dtm02.ffdo.de:20009',
+				'snng-ber01.ffdo.de:20009',
+				'snng-ber02.ffdo.de:20009',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom10.conf b/domains/ffdo_dom10.conf
new file mode 100644
index 0000000..fe925f7
--- /dev/null
+++ b/domains/ffdo_dom10.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom10 = 'Freifunk Dortmund - Domäne 10 - Unna',
+    },
+	domain_seed = 'f60f42f60b7d489cedbfbe96ed11139712be51bd3748790d67504b2345dc022b',
+
+	prefix4 = '10.10.0.0/16',
+	prefix6 = '2a03:2260:300a:000a::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-10-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-10-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.10.255.254',
+		ip6 = '2a03:2260:300a:000a::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20010',
+				'snng-dtm02.ffdo.de:20010',
+				'snng-ber01.ffdo.de:20010',
+				'snng-ber02.ffdo.de:20010',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git a/domains/ffdo_dom11.conf b/domains/ffdo_dom11.conf
new file mode 100644
index 0000000..91bb1de
--- /dev/null
+++ b/domains/ffdo_dom11.conf
@@ -0,0 +1,41 @@
+{
+    domain_names = {
+        ffdo_dom11 = 'Freifunk Dortmund - Domäne 11 - Schwerte, Holzwickede, Fröndenberg',
+    },
+	domain_seed = '316326a5a4d1c84ee1807c99012151248f4fa41a6485d22f6932a190c56b4a4a',
+
+	prefix4 = '10.11.0.0/16',
+	prefix6 = '2a03:2260:300a:000b::/64',
+
+    wifi24 = {
+        ap = {
+          ssid = 'Freifunk',
+        },
+        mesh = {
+			id = 'ffdo-11-ibss-batadv5',
+        },
+    },
+    wifi5 = {
+        ap = {
+          ssid = 'Freifunk (5GHz)',
+        },
+        mesh = {
+			id = 'ffdo-11-ibss-batadv5',
+        },
+    },
+	next_node = {
+		ip4 = '10.11.255.254',
+		ip6 = '2a03:2260:300a:000b::ffd0',
+		mac = '02:ff:d0:09:ff:02',
+	},
+	mesh_vpn = {
+		tunneldigger = {
+			brokers = {
+				'snng-dtm01.ffdo.de:20011',
+				'snng-dtm02.ffdo.de:20011',
+				'snng-ber01.ffdo.de:20011',
+				'snng-ber02.ffdo.de:20011',
+			},
+		},
+	},
+}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-01/site.mk" "b/generated/sites/Dom\303\244ne-01/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-01/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-02/i18n/de.po" "b/generated/sites/Dom\303\244ne-02/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-02/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-02/i18n/en.po" "b/generated/sites/Dom\303\244ne-02/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-02/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-02/modules" "b/generated/sites/Dom\303\244ne-02/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-02/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-02/site.conf" "b/generated/sites/Dom\303\244ne-02/site.conf"
deleted file mode 100644
index 4121769..0000000
--- "a/generated/sites/Dom\303\244ne-02/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-DO-',
-	site_name = 'Freifunk Dortmund - Domäne 02 - Außenbezirke',
-	site_code = 'ffdo-d02',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '9bfb5d60aade652b8a1f7d7fa46c51b291dba4ef6ba03e5f46d8d4cef23ae00a',
-
-	prefix4 = '10.02.0.0/16',
-	prefix6 = '2a03:2260:300a:0002::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene02/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-02-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:02',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-02-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:02',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.02.255.254',
-		ip6 = '2a03:2260:300a:0002::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20002',
-				'snng-dtm02.ffdo.de:20002',
-				'snng-ber01.ffdo.de:20002',
-				'snng-ber02.ffdo.de:20002',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene02/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene02/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene02/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-02/site.mk" "b/generated/sites/Dom\303\244ne-02/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-02/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-03/i18n/de.po" "b/generated/sites/Dom\303\244ne-03/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-03/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-03/i18n/en.po" "b/generated/sites/Dom\303\244ne-03/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-03/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-03/modules" "b/generated/sites/Dom\303\244ne-03/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-03/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-03/site.conf" "b/generated/sites/Dom\303\244ne-03/site.conf"
deleted file mode 100644
index 199769b..0000000
--- "a/generated/sites/Dom\303\244ne-03/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-DO-',
-	site_name = 'Freifunk Dortmund - Domäne 03 - Dortmund 1',
-	site_code = 'ffdo-d03',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '72d1940c9f77860ac1ca8b5778ab9e82e60194f80e35ff76033df2fa610efe3b',
-
-	prefix4 = '10.03.0.0/16',
-	prefix6 = '2a03:2260:300a:0003::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene03/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-03-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:03',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-03-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:03',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.03.255.254',
-		ip6 = '2a03:2260:300a:0003::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20003',
-				'snng-dtm02.ffdo.de:20003',
-				'snng-ber01.ffdo.de:20003',
-				'snng-ber02.ffdo.de:20003',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene03/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene03/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene03/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-03/site.mk" "b/generated/sites/Dom\303\244ne-03/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-03/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-04/i18n/de.po" "b/generated/sites/Dom\303\244ne-04/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-04/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-04/i18n/en.po" "b/generated/sites/Dom\303\244ne-04/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-04/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-04/modules" "b/generated/sites/Dom\303\244ne-04/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-04/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-04/site.conf" "b/generated/sites/Dom\303\244ne-04/site.conf"
deleted file mode 100644
index 3545c7b..0000000
--- "a/generated/sites/Dom\303\244ne-04/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-DO-',
-	site_name = 'Freifunk Dortmund - Domäne 04 - Dortmund 2',
-	site_code = 'ffdo-d04',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '2941072831dc0e652118d9fe8ed20be1c8919d1711d4cc2896f8340c2ca51873',
-
-	prefix4 = '10.04.0.0/16',
-	prefix6 = '2a03:2260:300a:0004::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene04/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-04-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:04',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-04-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:04',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.04.255.254',
-		ip6 = '2a03:2260:300a:0004::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20004',
-				'snng-dtm02.ffdo.de:20004',
-				'snng-ber01.ffdo.de:20004',
-				'snng-ber02.ffdo.de:20004',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene04/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene04/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene04/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-04/site.mk" "b/generated/sites/Dom\303\244ne-04/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-04/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-05/i18n/de.po" "b/generated/sites/Dom\303\244ne-05/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-05/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-05/i18n/en.po" "b/generated/sites/Dom\303\244ne-05/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-05/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-05/modules" "b/generated/sites/Dom\303\244ne-05/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-05/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-05/site.conf" "b/generated/sites/Dom\303\244ne-05/site.conf"
deleted file mode 100644
index 2a162b6..0000000
--- "a/generated/sites/Dom\303\244ne-05/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-DO-',
-	site_name = 'Freifunk Dortmund - Domäne 05 - Dortmund 3',
-	site_code = 'ffdo-d05',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = 'b87c485d1aba7790fb402ce9bb6e237c6cd42c7cdd8dfb7cfbe3a37ec0c843d4',
-
-	prefix4 = '10.05.0.0/16',
-	prefix6 = '2a03:2260:300a:0005::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene05/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-05-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:05',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-05-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:05',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.05.255.254',
-		ip6 = '2a03:2260:300a:0005::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20005',
-				'snng-dtm02.ffdo.de:20005',
-				'snng-ber01.ffdo.de:20005',
-				'snng-ber02.ffdo.de:20005',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene05/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene05/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene05/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-05/site.mk" "b/generated/sites/Dom\303\244ne-05/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-05/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-06/i18n/de.po" "b/generated/sites/Dom\303\244ne-06/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-06/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-06/i18n/en.po" "b/generated/sites/Dom\303\244ne-06/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-06/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-06/modules" "b/generated/sites/Dom\303\244ne-06/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-06/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-06/site.conf" "b/generated/sites/Dom\303\244ne-06/site.conf"
deleted file mode 100644
index 2c6b5ea..0000000
--- "a/generated/sites/Dom\303\244ne-06/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-DO-',
-	site_name = 'Freifunk Dortmund - Domäne 06 - Dortmund 4',
-	site_code = 'ffdo-d06',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '2b575b88cb01d7ef137a8e12b0387d56f104d679c756bc9480ddfd1d055e135b',
-
-	prefix4 = '10.06.0.0/16',
-	prefix6 = '2a03:2260:300a:0006::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene06/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-06-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:06',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-06-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:06',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.06.255.254',
-		ip6 = '2a03:2260:300a:0006::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20006',
-				'snng-dtm02.ffdo.de:20006',
-				'snng-ber01.ffdo.de:20006',
-				'snng-ber02.ffdo.de:20006',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene06/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene06/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene06/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-06/site.mk" "b/generated/sites/Dom\303\244ne-06/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-06/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-07/i18n/de.po" "b/generated/sites/Dom\303\244ne-07/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-07/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-07/i18n/en.po" "b/generated/sites/Dom\303\244ne-07/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-07/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-07/modules" "b/generated/sites/Dom\303\244ne-07/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-07/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-07/site.conf" "b/generated/sites/Dom\303\244ne-07/site.conf"
deleted file mode 100644
index ffd393a..0000000
--- "a/generated/sites/Dom\303\244ne-07/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-Werne-',
-	site_name = 'Freifunk Dortmund - Domäne 07 - Werne',
-	site_code = 'ffdo-d07',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = 'bb9eec48817c07905004de4284a700f16b9370773e143acce4dd241bbcd423d0',
-
-	prefix4 = '10.07.0.0/16',
-	prefix6 = '2a03:2260:300a:0007::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene07/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-07-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:07',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-07-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:07',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.07.255.254',
-		ip6 = '2a03:2260:300a:0007::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20007',
-				'snng-dtm02.ffdo.de:20007',
-				'snng-ber01.ffdo.de:20007',
-				'snng-ber02.ffdo.de:20007',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene07/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene07/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene07/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-07/site.mk" "b/generated/sites/Dom\303\244ne-07/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-07/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-08/i18n/de.po" "b/generated/sites/Dom\303\244ne-08/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-08/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-08/i18n/en.po" "b/generated/sites/Dom\303\244ne-08/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-08/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-08/modules" "b/generated/sites/Dom\303\244ne-08/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-08/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-08/site.conf" "b/generated/sites/Dom\303\244ne-08/site.conf"
deleted file mode 100644
index 62fba97..0000000
--- "a/generated/sites/Dom\303\244ne-08/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-Luenen-',
-	site_name = 'Freifunk Dortmund - Domäne 08 - Lünen',
-	site_code = 'ffdo-d08',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = 'aa7fd7cbaee103d5d55845e9ff29f38fdfc115924b9a5e981097172b000390c6',
-
-	prefix4 = '10.08.0.0/16',
-	prefix6 = '2a03:2260:300a:0008::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene08/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-08-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:08',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-08-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:08',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.08.255.254',
-		ip6 = '2a03:2260:300a:0008::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20008',
-				'snng-dtm02.ffdo.de:20008',
-				'snng-ber01.ffdo.de:20008',
-				'snng-ber02.ffdo.de:20008',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene08/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene08/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene08/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-08/site.mk" "b/generated/sites/Dom\303\244ne-08/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-08/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-09/i18n/de.po" "b/generated/sites/Dom\303\244ne-09/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-09/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-09/i18n/en.po" "b/generated/sites/Dom\303\244ne-09/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-09/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-09/modules" "b/generated/sites/Dom\303\244ne-09/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-09/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-09/site.conf" "b/generated/sites/Dom\303\244ne-09/site.conf"
deleted file mode 100644
index 40acdf8..0000000
--- "a/generated/sites/Dom\303\244ne-09/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-Kamen-',
-	site_name = 'Freifunk Dortmund - Domäne 09 - Bergkamen, Kamen, Bönen',
-	site_code = 'ffdo-d09',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = 'a9c40bac755e5317724164738e822775097a34ee7a417fbd3aa544b391f03fa1',
-
-	prefix4 = '10.09.0.0/16',
-	prefix6 = '2a03:2260:300a:0009::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene09/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-09-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:09',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-09-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:09',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.09.255.254',
-		ip6 = '2a03:2260:300a:0009::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20009',
-				'snng-dtm02.ffdo.de:20009',
-				'snng-ber01.ffdo.de:20009',
-				'snng-ber02.ffdo.de:20009',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene09/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene09/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene09/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-09/site.mk" "b/generated/sites/Dom\303\244ne-09/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-09/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-10/i18n/de.po" "b/generated/sites/Dom\303\244ne-10/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-10/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-10/i18n/en.po" "b/generated/sites/Dom\303\244ne-10/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-10/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-10/modules" "b/generated/sites/Dom\303\244ne-10/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-10/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-10/site.conf" "b/generated/sites/Dom\303\244ne-10/site.conf"
deleted file mode 100644
index 370b2b0..0000000
--- "a/generated/sites/Dom\303\244ne-10/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-Unna-',
-	site_name = 'Freifunk Dortmund - Domäne 10 - Unna',
-	site_code = 'ffdo-d10',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = 'f60f42f60b7d489cedbfbe96ed11139712be51bd3748790d67504b2345dc022b',
-
-	prefix4 = '10.10.0.0/16',
-	prefix6 = '2a03:2260:300a:000a::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene10/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-10-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:0a',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-10-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:0a',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.10.255.254',
-		ip6 = '2a03:2260:300a:000a::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20010',
-				'snng-dtm02.ffdo.de:20010',
-				'snng-ber01.ffdo.de:20010',
-				'snng-ber02.ffdo.de:20010',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene10/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene10/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene10/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-10/site.mk" "b/generated/sites/Dom\303\244ne-10/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-10/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-11/i18n/de.po" "b/generated/sites/Dom\303\244ne-11/i18n/de.po"
deleted file mode 100644
index e13343e..0000000
--- "a/generated/sites/Dom\303\244ne-11/i18n/de.po"
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-11/i18n/en.po" "b/generated/sites/Dom\303\244ne-11/i18n/en.po"
deleted file mode 100644
index bb4e8e4..0000000
--- "a/generated/sites/Dom\303\244ne-11/i18n/en.po"
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git "a/generated/sites/Dom\303\244ne-11/modules" "b/generated/sites/Dom\303\244ne-11/modules"
deleted file mode 100644
index 565fc2a..0000000
--- "a/generated/sites/Dom\303\244ne-11/modules"
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git "a/generated/sites/Dom\303\244ne-11/site.conf" "b/generated/sites/Dom\303\244ne-11/site.conf"
deleted file mode 100644
index 1ec1e0f..0000000
--- "a/generated/sites/Dom\303\244ne-11/site.conf"
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-Schwerte-',
-	site_name = 'Freifunk Dortmund - Domäne 11 - Schwerte, Holzwickede, Fröndenberg',
-	site_code = 'ffdo-d11',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '316326a5a4d1c84ee1807c99012151248f4fa41a6485d22f6932a190c56b4a4a',
-
-	prefix4 = '10.11.0.0/16',
-	prefix6 = '2a03:2260:300a:000b::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene11/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-11-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:0b',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-11-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:0b',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.11.255.254',
-		ip6 = '2a03:2260:300a:000b::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20011',
-				'snng-dtm02.ffdo.de:20011',
-				'snng-ber01.ffdo.de:20011',
-				'snng-ber02.ffdo.de:20011',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene11/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene11/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene11/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}
\ No newline at end of file
diff --git "a/generated/sites/Dom\303\244ne-11/site.mk" "b/generated/sites/Dom\303\244ne-11/site.mk"
deleted file mode 100644
index b2d9796..0000000
--- "a/generated/sites/Dom\303\244ne-11/site.mk"
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/generated/sites/Dom\303\244ne-01/i18n/de.po" b/i18n/de.po
similarity index 100%
rename from "generated/sites/Dom\303\244ne-01/i18n/de.po"
rename to i18n/de.po
diff --git "a/generated/sites/Dom\303\244ne-01/i18n/en.po" b/i18n/en.po
similarity index 100%
rename from "generated/sites/Dom\303\244ne-01/i18n/en.po"
rename to i18n/en.po
diff --git a/make-all-site-conf.sh b/make-all-site-conf.sh
deleted file mode 100755
index d8792d8..0000000
--- a/make-all-site-conf.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# The output dir will be deleted and recreated in the process!
-OUTPUT_DIR=./generated/sites
-
-for target in "./sites/configs/"*
-do
-	./create_sitedir.py "./sites/templates" "./sites/common" "$target" "$OUTPUT_DIR/$(basename "$target" .yaml)"
-done
-echo "Site configurations created in $OUTPUT_DIR"
diff --git a/manifest.py b/manifest.py
new file mode 100755
index 0000000..3372745
--- /dev/null
+++ b/manifest.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+import argparse
+import time
+
+parser = argparse.ArgumentParser(description='Combine multiple manifests into a new manifest')
+parser.add_argument('-b', '--branch', default='stable', help='Branch name to set')
+parser.add_argument('-p', '--priority', type=int, default=0, help='Priority to set')
+parser.add_argument('manifest', nargs='+', help='Manifest files to include in output manifest')
+
+def main():
+    args = parser.parse_args()
+    print('BRANCH=%s' % args.branch)
+    offset = time.strftime('%z')
+    print('DATE=%s' % time.strftime('%Y-%m-%d %H:%M:%S') + '%s:%s' % (offset[:-2], offset[3:]))
+    print('PRIORITY=%d' % args.priority)
+    print()
+
+    for manifest in args.manifest:
+        with open(manifest) as mfile:
+            for line in mfile:
+                if '=' in line:
+                    continue
+                l = line.strip()
+                if l != '':
+                    print(l)
+
+
+
+if __name__ == '__main__':
+    main()
+
diff --git "a/generated/sites/Dom\303\244ne-01/modules" b/modules
similarity index 100%
rename from "generated/sites/Dom\303\244ne-01/modules"
rename to modules
diff --git "a/generated/sites/Dom\303\244ne-01/site.conf" b/site.conf
similarity index 62%
rename from "generated/sites/Dom\303\244ne-01/site.conf"
rename to site.conf
index af6e968..350c079 100644
--- "a/generated/sites/Dom\303\244ne-01/site.conf"
+++ b/site.conf
@@ -1,20 +1,10 @@
 {
 	hostname_prefix = 'FF-DO-',
 	site_name = 'Freifunk Dortmund - Domäne 01 - Test und Dev',
-	site_code = 'ffdo-d01',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = 'eb3dcef920c7ac9b3c8bba69a137fcf88ad5d4dc2f97ff1c2f9f1ab2bb944eb7',
-
-	prefix4 = '10.01.0.0/16',
-	prefix6 = '2a03:2260:300a:0001::/64',
-
-	-- timezone
+	site_code = 'do',
+	default_domain = 'ffdo_dom01',
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	
-	-- network ntp services
 	ntp_servers = {
 		'ntp.services.ffdo.de',
 		'0.de.pool.ntp.org',
@@ -23,79 +13,44 @@
 		'3.de.pool.ntp.org'
 	},
 
-	-- regulatory domain of your wifi
 	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene01/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-01-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:01',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
+	config_mode = {
+		remote_login = {
+			show_password_form = true,
+			min_password_length = 1,
 		},
-		ibss = {
-			ssid = 'ffdo-01-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:01',
-			mcast_rate = 12000,
+		geo_location = {
+			show_altitude = false,
 		},
 	},
-
 	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.01.255.254',
-		ip6 = '2a03:2260:300a:0001::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:20001',
-				'snng-dtm02.ffdo.de:20001',
-				'snng-ber01.ffdo.de:20001',
-				'snng-ber02.ffdo.de:20001',
-			},
+        batman_adv = {
+            routing_algo = 'BATMAN_IV'
+        },
+    },
+	wifi24 = {
+		channel = 1,
+		mesh = {
+          mcast_rate = 12000,
+          disabled = false,
 		},
-		
-		bandwidth_limit = {
-			enabled = false,
+	},
+    wifi5 = {
+        channel = 44,
+        mesh = {
+          mcast_rate = 12000,
+          disabled = false,
+        },
+    },
+    mesh_vpn = {
+        enabled = true,
+        mtu = 1364,
+        bandwidth_limit = {
+            enabled = false,
 			ingress = 25000,
 			egress = 5000,
-		},
-	},
-
+        },
+    },
 	autoupdater = {
 		branch = 'stable',
 		branches = {
@@ -147,15 +102,9 @@
 			},
 		},
 	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
+    autorestart = {
+        interval = 'weekly',
+        starthour = 5,
+        endhour = 6,
+    },
 }
\ No newline at end of file
diff --git a/site.mk b/site.mk
new file mode 100644
index 0000000..aebe1f5
--- /dev/null
+++ b/site.mk
@@ -0,0 +1,82 @@
+GLUON_FEATURES := \
+	autoupdater \
+	config-mode-domain-select \
+	ebtables-filter-multicast \
+	ebtables-filter-ra-dhcp \
+	ebtables-limit-arp \
+	mesh-batman-adv-15 \
+	mesh-vpn-tunneldigger \
+	radvd \
+	respondd \
+	status-page \
+	web-advanced \
+	web-private-wifi \
+	web-wizard
+
+GLUON_SITE_PACKAGES := \
+	haveged \
+	iwinfo \
+	iptables
+
+USB_BASIC := \
+	kmod-usb-core \
+	kmod-usb2 \
+	kmod-usb-hid
+
+USB_NIC := \
+	kmod-usb-net \
+	kmod-usb-net-asix \
+	kmod-usb-net-rtl8150 \
+	kmod-usb-net-rtl8152 \
+	kmod-usb-net-dm9601-ether
+
+USB_WIFI := \
+	kmod-rtl8192cu
+
+ifeq ($(GLUON_TARGET),x86-generic)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		kmod-usb-ohci-pci \
+		$(USB_NIC)
+endif
+
+ifeq ($(GLUON_TARGET),x86-64)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC) \
+		kmod-igb #APU2
+endif
+
+ifeq ($(GLUON_TARGET),brcm2708-bcm2708)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC) \
+		$(USB_WIFI)
+endif
+
+ifeq ($(GLUON_TARGET),brcm2708-bcm2709)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC) \
+		$(USB_WIFI)
+endif
+
+DEFAULT_GLUON_RELEASE := v1.6.X-exp-$(shell date '+%Y%m%d')
+
+# Allow overriding the release number from the command line
+GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+
+# Default priority for updates.
+GLUON_PRIORITY ?= 0
+
+GLUON_LANGS ?= en de
+
+GLUON_ATH10K_MESH ?= 11s
+
+GLUON_REGION := eu
+
+GLUON_MULTIDOMAIN=1
+
+# Do not build images for deprecated devices
+GLUON_DEPRECATED ?= 1
+
diff --git a/sites/common/i18n/de.po b/sites/common/i18n/de.po
deleted file mode 100644
index e13343e..0000000
--- a/sites/common/i18n/de.po
+++ /dev/null
@@ -1,84 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Dortmunder "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann.<br />"
-"Auf der <a href=\"https://fw-download.ffdo.de/\">Download-Seite</a> ist eine"
-"Karte zur Auswahl der Domäne verfügbar."
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens zur Information."
-"Der Knoten ist nun direkt nutzbar."
-"Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
-"</p>"
-"<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
-"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
-"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
-"</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Dein Knoten<em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden."
-"Informationen zu Freifunk Dortmund findest du auf der <a href=\"http://www.freifunk-dortmund.de/\">lokalen Webseite</a>."
-"Weitere Informationen zum Freifunk Rheinland e.V. findest du auf <a href=\"https://freifunk-rheinland.net/\">unserer Vereinswebseite</a>.</p>"
-"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
-"Betrieb für ca. 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
-"Mode neustarten.</p>"
-"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git a/sites/common/i18n/en.po b/sites/common/i18n/en.po
deleted file mode 100644
index bb4e8e4..0000000
--- a/sites/common/i18n/en.po
+++ /dev/null
@@ -1,82 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2016-02-04 14:28+0100\n"
-"Last-Translator: David Lutz <kpanic@hirnduenger.de>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Welcome to the setup wizard of your new Freifunk Dortmund node. Please "
-"fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain.<br />"
-"A map to choose the your domain is availabe on the "
-"<a href=\"https://fw-download.ffdo.de/\">download page</a>."
-
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>"
-"This is your Freifunk node's public key. You can use your node right away."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that.  "
-"Your can find lots of information on Freifunk in Dortmund on "
-"<a href=\"http://www.freifunk-dortmund.de/\">our homepage</a>.</p>"
-"<p>To get back to this configuration interface, press the reset button for "
-"about 10 seconds during normal operation. The device will then reboot into "
-"config mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
diff --git a/sites/common/modules b/sites/common/modules
deleted file mode 100644
index 565fc2a..0000000
--- a/sites/common/modules
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffms'
-
-PACKAGES_FFMS_REPO=https://github.com/FreiFunkMuenster/packages-ffms.git
-PACKAGES_FFMS_COMMIT=cd220da232057e39bfb079d1b9c1bc49077b2a56
-PACKAGES_FFMS_BRANCH=v2018.1.x
diff --git a/sites/common/site.mk b/sites/common/site.mk
deleted file mode 100644
index b2d9796..0000000
--- a/sites/common/site.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-##	gluon site.mk makefile example
-
-##	GLUON_FEATURES
-#		Specify Gluon features/packages to enable;
-#		Gluon will automatically enable a set of packages
-#		depending on the combination of features listed
-
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-tunneldigger \
-	radvd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-##	GLUON_MULTIDOMAIN
-# Build gluon with multidomain support.
-
-GLUON_MULTIDOMAIN=0
-
-##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/OpenWrt packages to include here;
-#		A minus sign may be prepended to remove a packages from the
-#		selection that would be enabled by default or due to the
-#		chosen feature flags
-
-GLUON_SITE_PACKAGES := \
-	haveged \
-	iwinfo \
-	iptables \
-	gluon-ssid-changer 
-
-##	DEFAULT_GLUON_RELEASE
-#		version string to use for images
-#		gluon relies on
-#			opkg compare-versions "$1" '>>' "$2"
-#		to decide if a version is newer or not.
-
-DEFAULT_GLUON_RELEASE := 2.1.0+exp$(shell date '+%Y%m%d')
-
-
-##	GLUON_RELEASE
-#		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
-#		e.g.:
-#			$ make images GLUON_RELEASE=23.42+5
-#		would generate images named like this:
-#			gluon-ff%site_code%-23.42+5-%router_model%.bin
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-# Default priority for updates.
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# Use ibss enabled firmware for ath10k
-GLUON_WLAN_MESH ?= ibss
-
-# Languages to include
-GLUON_LANGS ?= en de
-
-
diff --git "a/sites/configs/Dom\303\244ne-01.yaml" "b/sites/configs/Dom\303\244ne-01.yaml"
deleted file mode 100644
index 7e99bf3..0000000
--- "a/sites/configs/Dom\303\244ne-01.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 01 - Test und Dev
-city: DO
-seed: eb3dcef920c7ac9b3c8bba69a137fcf88ad5d4dc2f97ff1c2f9f1ab2bb944eb7
-domain_id: 1
diff --git "a/sites/configs/Dom\303\244ne-02.yaml" "b/sites/configs/Dom\303\244ne-02.yaml"
deleted file mode 100644
index 66c67fd..0000000
--- "a/sites/configs/Dom\303\244ne-02.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 02 - Außenbezirke
-city: DO
-seed: 9bfb5d60aade652b8a1f7d7fa46c51b291dba4ef6ba03e5f46d8d4cef23ae00a
-domain_id: 2
diff --git "a/sites/configs/Dom\303\244ne-03.yaml" "b/sites/configs/Dom\303\244ne-03.yaml"
deleted file mode 100644
index b6aa59e..0000000
--- "a/sites/configs/Dom\303\244ne-03.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 03 - Dortmund 1
-city: DO
-seed: 72d1940c9f77860ac1ca8b5778ab9e82e60194f80e35ff76033df2fa610efe3b
-domain_id: 3
diff --git "a/sites/configs/Dom\303\244ne-04.yaml" "b/sites/configs/Dom\303\244ne-04.yaml"
deleted file mode 100644
index 1b1e5fa..0000000
--- "a/sites/configs/Dom\303\244ne-04.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 04 - Dortmund 2
-city: DO
-seed: 2941072831dc0e652118d9fe8ed20be1c8919d1711d4cc2896f8340c2ca51873
-domain_id: 4
diff --git "a/sites/configs/Dom\303\244ne-05.yaml" "b/sites/configs/Dom\303\244ne-05.yaml"
deleted file mode 100644
index 9a39845..0000000
--- "a/sites/configs/Dom\303\244ne-05.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 05 - Dortmund 3
-city: DO
-seed: b87c485d1aba7790fb402ce9bb6e237c6cd42c7cdd8dfb7cfbe3a37ec0c843d4
-domain_id: 5
diff --git "a/sites/configs/Dom\303\244ne-06.yaml" "b/sites/configs/Dom\303\244ne-06.yaml"
deleted file mode 100644
index 02fa20c..0000000
--- "a/sites/configs/Dom\303\244ne-06.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 06 - Dortmund 4
-city: DO
-seed: 2b575b88cb01d7ef137a8e12b0387d56f104d679c756bc9480ddfd1d055e135b
-domain_id: 6
diff --git "a/sites/configs/Dom\303\244ne-07.yaml" "b/sites/configs/Dom\303\244ne-07.yaml"
deleted file mode 100644
index 001e776..0000000
--- "a/sites/configs/Dom\303\244ne-07.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 07 - Werne
-city: Werne
-seed: bb9eec48817c07905004de4284a700f16b9370773e143acce4dd241bbcd423d0
-domain_id: 7
diff --git "a/sites/configs/Dom\303\244ne-08.yaml" "b/sites/configs/Dom\303\244ne-08.yaml"
deleted file mode 100644
index a1e58cd..0000000
--- "a/sites/configs/Dom\303\244ne-08.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 08 - Lünen
-city: Luenen
-seed: aa7fd7cbaee103d5d55845e9ff29f38fdfc115924b9a5e981097172b000390c6
-domain_id: 8
diff --git "a/sites/configs/Dom\303\244ne-09.yaml" "b/sites/configs/Dom\303\244ne-09.yaml"
deleted file mode 100644
index 715d61d..0000000
--- "a/sites/configs/Dom\303\244ne-09.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 09 - Bergkamen, Kamen, Bönen
-city: Kamen
-seed: a9c40bac755e5317724164738e822775097a34ee7a417fbd3aa544b391f03fa1
-domain_id: 9
diff --git "a/sites/configs/Dom\303\244ne-10.yaml" "b/sites/configs/Dom\303\244ne-10.yaml"
deleted file mode 100644
index a6de54a..0000000
--- "a/sites/configs/Dom\303\244ne-10.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 10 - Unna
-city: Unna
-seed: f60f42f60b7d489cedbfbe96ed11139712be51bd3748790d67504b2345dc022b
-domain_id: 10
diff --git "a/sites/configs/Dom\303\244ne-11.yaml" "b/sites/configs/Dom\303\244ne-11.yaml"
deleted file mode 100644
index 05d64a0..0000000
--- "a/sites/configs/Dom\303\244ne-11.yaml"
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Freifunk Dortmund - Domäne 11 - Schwerte, Holzwickede, Fröndenberg
-city: Schwerte
-seed: 316326a5a4d1c84ee1807c99012151248f4fa41a6485d22f6932a190c56b4a4a
-domain_id: 11
diff --git a/sites/templates/site.conf b/sites/templates/site.conf
deleted file mode 100644
index 37fc7e9..0000000
--- a/sites/templates/site.conf
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	hostname_prefix = 'FF-{{ city }}-',
-	site_name = '{{ name }}',
-	site_code = 'ffdo-d{{ "%02d" | format(domain_id) }}',
-
-	-- 32 byte random data in hexadecimal encoding
-	-- This data must be unique among all sites and domains!
-	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '{{ seed }}',
-
-	prefix4 = '10.{{ "%02d" | format(domain_id) }}.0.0/16',
-	prefix6 = '2a03:2260:300a:00{{ "%02x" | format(domain_id) }}::/64',
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	
-	-- network ntp services
-	ntp_servers = {
-		'ntp.services.ffdo.de',
-		'0.de.pool.ntp.org',
-		'1.de.pool.ntp.org',
-		'2.de.pool.ntp.org',
-		'3.de.pool.ntp.org'
-	},
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- opkg = {
-	-- 	extra = {
-	-- 		gluon = 'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene{{ "%02d" | format(domain_id) }}/releases/%GR/modules/%S',
-	-- 	},
-	-- },
-
-	wifi24 = {
-		channel = 1,
-		-- remove 802.11b compatibility
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = 'Freifunk',
-		},
-
-		-- 802.11s mesh interface with forwarding disabled
-		-- mesh {
-		-- 		id = 'sXnhHDba',
-		-- 		mcast_rate = 12000,
-		-- 		},
-
-		-- ad-hoc interface
-		ibss = {
-			ssid = 'ffdo-{{ "%02d" | format(domain_id) }}-ibss-batadv',
-			bssid = '02:ff:d0:09:fd:{{ "%02x" | format(domain_id) }}',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk (5GHz)',
-		},
-		ibss = {
-			ssid = 'ffdo-{{ "%02d" | format(domain_id) }}-ibss-batadv5',
-			bssid = '02:ff:d0:09:fe:{{ "%02x" | format(domain_id) }}',
-			mcast_rate = 12000,
-		},
-	},
-
-	mesh = {
-		vxlan = false,
-	},
-
-	next_node = {
-		ip4 = '10.{{ "%02d" | format(domain_id) }}.255.254',
-		ip6 = '2a03:2260:300a:00{{ "%02x" | format(domain_id) }}::ffd0',
-		mac = '02:ff:d0:09:ff:02',
-	},
-
-	mesh_vpn = {
-		mtu = 1364,
-		enabled = true,
-		tunneldigger = {
-			brokers = {
-				'snng-dtm01.ffdo.de:200{{ "%02d" | format(domain_id) }}',
-				'snng-dtm02.ffdo.de:200{{ "%02d" | format(domain_id) }}',
-				'snng-ber01.ffdo.de:200{{ "%02d" | format(domain_id) }}',
-				'snng-ber02.ffdo.de:200{{ "%02d" | format(domain_id) }}',
-			},
-		},
-		
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 25000,
-			egress = 5000,
-		},
-	},
-
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene{{ "%02d" | format(domain_id) }}/stable/images/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene{{ "%02d" | format(domain_id) }}/beta/images/sysupgrade'
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://update.services.ffdo.de/ffdo_ng/domaenen/domaene{{ "%02d" | format(domain_id) }}/experimental/images/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'5ac010e23df82fa514b2d2544312e3ac5757a58fe69141c980a4db0e89a06e31', -- Christian
-					'4b74a95381fdb8d4db0f69effde000befe8e58a14996a8f732213cc40627b7fe', -- Markus
-					'64825ce2492cf99c51abcba32bd08bd8f880da58e606b3957159c78725d739ca', -- Till
-					'497223af7ce512a31d7c282765951063d781f46f6e6a890faa3bf2e03fe2e19c', -- Torben
-					'6274bc371973f6cedd6c63523388fda3a938df26a1cfbe91378c8c0a1bf6efca', -- Tim
-					'9ff0fe17bac59f48db2bce0bd78016b6081324140da6d483e53ad7008d728290', -- Stefan
-					'59beffa6ce536e119c91a0ea83a20747b8f753311113c7e97f82444661ca21ba', -- Cajus
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- password section in config mode
-		remote_login = {
-			show_password_form = true, -- default false
-			min_password_length = 1,  -- default is 12; disable check is 1
-		},
-		geo_location = {
-			show_altitude = false,
-		},
-	},
-}