cleanup cm

package/gluon-mesh-olsr12-openvpn/Makefile

@@ -1,13 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-mesh-olsr12-openvpn
-PKG_VERSION=1
-
-include ../gluon.mk
-
-define Package/gluon-mesh-olsr12-openvpn
-  TITLE:=olsrd v1 to v2 migration fallback vpn
-  DEPENDS:= +gluon-mesh-olsrd +openvpn
-endef
-
-$(eval $(call BuildPackageGluon,gluon-mesh-olsr12-openvpn))

package/gluon-mesh-olsr12-openvpn/README.md

@@ -1,62 +0,0 @@
-# ffgraz-mesh-olsr12-openvpn
-
-This package is used to allow a seamless olsr2 migration
-in an existing olsr1 mesh,
-by connecting to a shared openvpn server that is reachable from
-the olsr1 mesh.
-
-Technical presentation (german): https://docs.google.com/presentation/d/1IPWPsQH3fNRfGLB4s2G2gFVltrFcg6gDKNvkcgMcsvA/edit#slide=id.g122e82f6b82_0_50
-
-Configuration for site.conf
-
-```
-{
-  mesh = {
-    olsrd = {
-      -- ...
-      olsr12 = {
-        enable = true,
-        server = 'OLSR-IP',
-        ca = [[
-paste openvpn ca here
-        ]],
-      },
-      -- ....
-    },
-  },
-```
-
-OpenVPN server
-
-```
-local OLSR-IP
-port 1194
-proto udp
-
-dev olsr12
-dev-type tap
-server 10.8.0.0 255.255.255.0
-
-keepalive 10 120
-
-persist-key
-persist-tun
-
-verify-client-cert none
-username-as-common-name
-script-security 3
-auth-user-pass-verify /bin/true via-env
-
-status /var/log/olsr12-openvpn-status.log
-log-append /var/log/olsr12-openvpn.log
-
-data-ciphers-fallback none
-dh none
-
-ca /var/olsr12.ca.crt
-cert /var/olsr12.crt
-key /var/olsr12.key
-
-verb 3
-explicit-exit-notify 1
-```

package/gluon-mesh-olsr12-openvpn/check_site.lua

@@ -1,5 +0,0 @@
-if need_boolean({'mesh', 'olsrd', 'olsr12', 'enable'}, false) then
-  need_number({'mesh', 'olsrd', 'olsr12', 'port'}, false)
-  need_string({'mesh', 'olsrd', 'olsr12', 'ca'})
-  need_string({'mesh', 'olsrd', 'olsr12', 'server'})
-end

package/gluon-mesh-olsr12-openvpn/luasrc/lib/gluon/upgrade/380-gluon-mesh-olsr12-openvpn

@@ -1,64 +0,0 @@
-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-local site = require 'gluon.site'
-local util = require 'gluon.util'
-local wireless = require 'gluon.wireless'
-local sysconfig = require 'gluon.sysconfig'
-local util = require 'gluon.util'
-local olsrd = require 'gluon.olsrd'
-
-uci:delete('openvpn', 'olsr12_vpn')
-
--- NOTE: we need to place olsr12 files in a persistent directory,
--- since reconfigure only happens on upgrades
--- But since it happens on upgrades, we do not need to store it
--- in a permanent directory like /etc/openvpn
-
-if site.mesh.olsrd.olsr12.enable(false) then
-	-- TODO: gluon_wired once added in mesh-olsrd
-	uci:section('network', 'interface', 'olsr12', {
-		ifname = 'olsr12',
-		proto = 'gluon_mesh',
-	})
-
-	local cred = io.open('/etc/olsr12.auth', 'w')
-	cred:write(sysconfig.primary_mac .. '\n' .. sysconfig.primary_mac .. '\n')
-	cred:close()
-
-	local ca = io.open('/etc/olsr12.ca', 'w')
-	ca:write(site.mesh.olsrd.olsr12.ca())
-	ca:close()
-
-	uci:section('openvpn', 'openvpn', 'olsr12_vpn', {
-		enabled = true,
-		client = true,
-
-		dev = 'olsr12',
-		dev_type = 'tap',
-
-		data_ciphers_fallback = 'none',
-		persist_key = true,
-		persist_tun = true,
-
-		ca = '/etc/olsr12.ca',
-
-		verb = 3,
-
-		remote = {
-			site.mesh.olsrd.olsr12.server() .. " " .. site.mesh.olsrd.olsr12.port(1194)
-		},
-
-		auth_user_pass = '/etc/olsr12.auth',
-	})
-
-	uci:section('olsrd2', 'interface', 'olsr12_mesh', {
-		ifname = { 'olsr12' },
-		bindto = uci:get_list('olsrd2', 'wired_mesh', 'bindto'),
-		-- TODO: link quality
-	})
-end
-
-uci:save('olsrd2')
-uci:save('network')
-uci:save('openvpn')