Cleanup a bit more and get ready to publish.

README.md

@@ -121,7 +121,7 @@ necessary configuration files from various `rc.conf` variables and hints.
 drive this process, such that more customized configurations can be
 co-mingled with its patterns.
 
-## How to setup using the `basic` sample configuration
+## Easy setup using the `basic` sample configuration 
 
 Executing this sequence of sample commands will setup a fully-functional SOHO
 router using this framework.  You'll need to fill in the appropriate choices
@@ -132,7 +132,7 @@ $ cd /etc
 $ mkdir router-conf
 $ cd router-conf
 $ git init .
-$ git submodule add rc.router https://gitea.nerdland.org/adam/rc.router
+$ git submodule add rc.router https://gitea.nerdland.org/rc.router/rc.router
 $ rc.router/scripts/install-dependencies.sh
 $ cp rc.router/samples/basic/* .
 $ cat << EOF > local.conf
@@ -173,7 +173,7 @@ add_net ${internal_card} 0 main
 
 EOF
 $ git add rc.conf
-$ git submodule add rc.router https://gitea.nerdland.org/adam/rc.router
+$ git submodule add rc.router https://gitea.nerdland.org/rc.router/rc.router
 $ git commit -m "FIRST POST!!!"
 $ rc.router/scripts/install-dependencies.sh
 $ echo 'rc_router_dir="/etc/router-conf/rc.router"' >> /etc/rc.conf
@@ -204,7 +204,7 @@ v4_net="172.26"
 add_v4_net ${internal_card} 0 main
 EOF
 $ git add rc.conf
-$ git submodule add rc.router https://gitea.nerdland.org/adam/rc.router
+$ git submodule add rc.router https://gitea.nerdland.org/rc.router/rc.router
 $ git commit -m "FIRST POST!!!"
 $ rc.router/scripts/install-dependencies.sh
 $ echo 'rc_router_dir="/etc/router-conf/rc.router"' >> /etc/rc.conf

docs/add_rtadv.md

@@ -35,4 +35,4 @@ add_rtadv abc3.765 # Adds `abc3.765` to `rtadvd_interfaces`
 
 ## See Also
  - [`add_net`](add_net.md)
- - [`add_rtadv`](add_rtadv.md)
+ - [`add_vlan`](add_vlan.md)

rc.d/localnet

@@ -38,7 +38,7 @@ localnet_build_zoneinfo()
 localnet_build_zoneinfo_impl()
 {
     #build_zoneinfo ${isp_prefix} 31 ${router_conf_dir}/namedb/local-machines.defs 
-    build_zoneinfo ${isp_prefix} 31 ${rc_router_conf_dir}/namedb/local-machines.defs > ${rc_router_gen_dir}/zone.hosts.nerdland.org
+    build_zoneinfo ${isp_prefix} ${localnet_generated_zone_subnet} ${rc_router_conf_dir}/namedb/local-machines.defs > ${rc_router_gen_dir}/zone.${localnet_generated_zone}
 }
 
 localnet_build_acls()
@@ -88,7 +88,10 @@ localnet_start() {
     # connections...
 
     localnet_build_acls
-    localnet_build_zoneinfo_impl
+	if [ `option_selected ${localnet_build_zoneinfo}` = "YES" ]
+	then
+		localnet_build_zoneinfo_impl
+	fi
 }
 
 localnet_stop() {

rc.d/route_policy

@@ -68,7 +68,7 @@ route_policy_start()
 
     # UGLY hack/workaround because of a kernel panic bug from
     # rtable rules in files included in `pf` anchors in FreeBSD 15
-    /etc/rc.d/pf reload
+    service pf reload
 }
 
 route_policy_stop()

rc.subr

@@ -586,7 +586,7 @@ build_zoneinfo()
     _subnet=${1} ; shift 1
     echo '$TTL 1h30m'
 
-    echo '@ IN SOA ns.nerdland.org. adam.imp-net.work. ('
+    echo '@ IN SOA ${localnet_generated_zone_authority}. ${localnet_generated_zone_admin}. ('
     date +'%s'
 
     echo 7200
@@ -596,9 +596,9 @@ build_zoneinfo()
 
     echo ')'
 
-    echo '$ORIGIN hosts.nerdland.org.'
+    echo '$ORIGIN ${localnet_generated_zone}.'
 
-    echo '@ IN NS xns.nerdland.org.'
+    echo '@ IN NS ${localnet_generated_zone_ns}.'
 
     for _hostline in $(cat ${1})
     do