Update setup script and template cfg

pull/1/head
Ken 2020-07-22 18:08:37 -04:00
parent 2851b86387
commit 30b9fbed55
2 changed files with 131 additions and 16 deletions

40
setup
View File

@ -4,7 +4,6 @@ CONTROLLER=https://github.com/EdgeVPNio/controller
TINCAN=https://github.com/EdgeVPNio/tincan
EXLIBS=https://github.com/ipop-project/3rd-Party-Libs.git
PYVER=3.6
EVIOVER=_20.7_amd64
function install_build_tools
{
@ -34,11 +33,17 @@ function make_tincan
function make_debpak
{
cp -r ../controller/* debian-package/edge-vpnio/opt/edge-vpnio/ && \
cp ../tincan/trunk/out/release/x86_64/tincan debian-package/edge-vpnio/opt/edge-vpnio/ && \
cp -r ../evio/controller/* debian-package/edge-vpnio/opt/edge-vpnio/ && \
cp ../evio/tincan/trunk/out/release/x86_64/tincan debian-package/edge-vpnio/opt/edge-vpnio/ && \
chmod +x debian-package/edge-vpnio/opt/edge-vpnio/tincan && \
./deb-gen
wd=$(pwd) && cd debian-package/ && \
./deb-gen && \
rm -rf edge-vpnio/opt/edge-vpnio/framework \
edge-vpnio/opt/edge-vpnio/modules \
edge-vpnio/opt/edge-vpnio/tincan \
edge-vpnio/opt/edge-vpnio/template-config.json \
edge-vpnio/opt/edge-vpnio/Controller.py && \
cd $wd
}
function make_testbed_prereqs
@ -78,8 +83,8 @@ function make_dkrimg
{
rm -f docker-image/edge-vpnio_20.7_amd64.deb
mv debian-package/edge-vpnio_20.7_amd64.deb docker-image/ && \
docker build -f ./docker-image/evio-base.Dockerfile -t kcratie/evio-base:1.0 ./docker-image && \
docker build -f ./docker-image/evio-node.Dockerfile -t kcratie/evio-node:20.7 ./docker-image
docker build -f ./docker-image/evio-base.Dockerfile -t edgevpnio/evio-base:1.0 ./docker-image && \
docker build -f ./docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:20.7 ./docker-image
}
function install_openfire
@ -114,21 +119,24 @@ function do_full_setup
}
case $1 in
src)
pull_src
;;
tincan)
make_tincan
;;
debpak)
make_debpak
;;
dkrimg)
make_dkrimg
;;
testbed)
make_testbed_prereqs
;;
venv)
make_venv
;;
img)
make_dkrimg
;;
tincan)
make_tincan
;;
src)
pull_src
;;
xmpp)
install_openfire
;;

View File

@ -0,0 +1,107 @@
{
"CFx": {
"Model": "Default",
"Overlays": [ "A1A111A" ],
"NodeId": "a100###feb6040628e5fb7e70b04f###"
},
"Logger": {
"LogLevel": "DEBUG",
"Device": "File",
"Directory": "/var/log/edge-vpnio/",
"CtrlLogFileName": "ctrl.log",
"TincanLogFileName": "tincan_log",
"MaxFileSize": 10000000,
"MaxArchives": 1
},
"Signal": {
"Enabled": true,
"Overlays": {
"A1A111A": {
"HostAddress": "*.*.*.*",
"AuthenticationMethod": "PASSWORD",
"Port": "5222",
"Username": "test1@openfire.local",
"Password": "password_test1",
"_AuthenticationMethod": "x509",
"_Port": "5223",
"_CertDirectory": "/var/edge-vpnio/cert",
"_CertFile": "evpn.crt",
"_KeyFile": "evpn.key"
}
}
},
"Topology": {
"PeerDiscoveryCoalesce": 1,
"Overlays": {
"A1A111A": {
"Name": "SymphonyRing",
"Description": "Scalable Symphony Ring Overlay for Bounded Flooding.",
"MaxSuccessors": 2,
"MaxOnDemandEdges": 1,
"MaxConcurrentEdgeSetup": 5,
"Role": "Switch"
}
}
},
"LinkManager": {
"Dependencies": [ "Logger", "TincanInterface", "Signal" ],
"Stun": [ "stun.l.google.com:19302", "stun1.l.google.com:19302" ],
"Overlays": {
"A1A111A": {
"Type": "TUNNEL",
"TapName": "tnl-"
}
}
},
"OverlayVisualizer": {
"Enabled": false,
"TimerInterval": 25,
"WebServiceAddress": "34.209.33.166:5000",
"NodeName": "nd-###"
},
"BridgeController": {
"Dependencies": [ "Logger", "LinkManager" ],
"BoundedFlood": {
"OverlayId": "A1A111A",
"LogDir": "/var/log/edge-vpnio/",
"LogFilename": "bf.log",
"LogLevel": "INFO",
"BridgeName": "evio",
"DemandThreshold": "100M",
"FlowIdleTimeout": 60,
"FlowHardTimeout": 60,
"MulticastBroadcastInterval": 60,
"MaxBytes": 10000000,
"BackupCount": 0,
"ProxyListenAddress": "",
"ProxyListenPort": 5802,
"MonitorInterval": 60,
"MaxOnDemandEdges": 0
},
"Overlays": {
"A1A111A": {
"NetDevice": {
"AutoDelete": true,
"Type": "OVS",
"SwitchProtocol": "BF",
"NamePrefix": "evio",
"MTU": 1410,
"AppBridge": {
"AutoDelete": true,
"Type": "OVS",
"NamePrefix": "brl",
"IP4": "10.10.10.###",
"PrefixLen": 24,
"MTU": 1410,
"NetworkAddress": "10.10.100.0/24"
}
},
"SDNController": {
"ConnectionType": "tcp",
"HostName": "127.0.0.1",
"Port": "6633"
}
}
}
}
}