nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesh-olsr12-openvpn: change conf dir

Browse Source
This commit is contained in:
Maciej Krüger 2022-04-02 13:27:07 +02:00 committed by Alexander List
parent 103b0defec
commit d3dfe57505
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/gluon-mesh-olsr12-openvpn/luasrc/lib/gluon/upgrade/380-gluon-mesh-olsr12-openvpn
View File

@ -10,6 +10,11 @@ local olsrd = require 'gluon.olsrd'
uci:delete('openvpn', 'olsr12_vpn') uci:delete('openvpn', 'olsr12_vpn')
-- NOTE: we need to place olsr12 files in a persistent directory,
-- since reconfigure only happens on upgrades
-- Since it happens on upgrades tho, we do not need to store it
-- in a permanent directory like /etc/openvpn
if site.mesh.olsrd.olsr12.enable() then if site.mesh.olsrd.olsr12.enable() then
-- TODO: gluon_wired once added in mesh-olsrd -- TODO: gluon_wired once added in mesh-olsrd
uci:section('network', 'interface', 'olsr12', { uci:section('network', 'interface', 'olsr12', {
@ -18,11 +23,11 @@ if site.mesh.olsrd.olsr12.enable() then
zone = 'mesh', zone = 'mesh',
}) })
local cred = io.open('/etc/openvpn/olsr12.auth', 'w') local cred = io.open('/etc/olsr12.auth', 'w')
cred:write(sysconfig.primary_mac .. '\n' .. sysconfig.primary_mac .. '\n') cred:write(sysconfig.primary_mac .. '\n' .. sysconfig.primary_mac .. '\n')
cred:close() cred:close()
local ca = io.open('/etc/openvpn/olsr12.ca', 'w') local ca = io.open('/etc/olsr12.ca', 'w')
ca:write(site.mesh.olsrd.olsr12.ca()) ca:write(site.mesh.olsrd.olsr12.ca())
ca:close() ca:close()
@ -37,7 +42,7 @@ if site.mesh.olsrd.olsr12.enable() then
persist_key = true, persist_key = true,
persist_tun = true, persist_tun = true,
ca = '/etc/openvpn/olsr12.ca', ca = '/etc/olsr12.ca',
verb = 3, verb = 3,
@ -45,7 +50,7 @@ if site.mesh.olsrd.olsr12.enable() then
site.mesh.olsrd.olsr12.server() .. " " .. site.mesh.olsrd.olsr12.port(1194) site.mesh.olsrd.olsr12.server() .. " " .. site.mesh.olsrd.olsr12.port(1194)
}, },
auth_user_pass = '/etc/openvpn/olsr12.auth', auth_user_pass = '/etc/olsr12.auth',
}) })
uci:section('olsrd2', 'interface', 'olsr12_mesh', { uci:section('olsrd2', 'interface', 'olsr12_mesh', {