apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-10-07 09:30:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: yum install failed for centos like.

Browse Source
This commit is contained in:
Daniel Ding
2022-11-19 11:59:53 +08:00
parent a6cfe7a56a
commit 8e4d541cfe
6 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/resource/point.cfg vendored
View File

@@ -1,4 +1,4 @@
# --- point.cfg --- # --- point.cfg ---
# This file define the configuration for OpenLAN Point. # This file define the configuration for OpenLAN Point.
OPTIONS='-log:file /dev/null -terminal off -cacert /etc/openlan/ca-trusted.crt' OPTIONS='-log:file /dev/null -terminal off'

11
dist/script/install.sh vendored
View File

@@ -12,11 +12,12 @@ function download() {
} }
function requires() { function requires() {
local os=$(cat /etc/os-release | grep ^ID= | sed 's/"//g') if type yum > /dev/null; then
if echo $os | grep -q -e centos -e redhat; then yum install -y net-tools iptables iputils openvpn openvswitch dnsmasq
yum install -y net-tools iptables iputils openvpn openssl11 openvswitch dnsmasq elif type apt > /dev/null; then
elif echo $os | grep -q -e debian -e ubuntu; then apt-get install -y net-tools iptables iproute2 openvpn openvswitch-switch dnsmasq
apt-get install -y net-tools iptables iproute2 openvpn openssl openvswitch-switch dnsmasq else
echo "We didn't find yum and apt."
fi fi
} }

26
pkg/cache/store_test.go vendored
View File

@@ -24,35 +24,35 @@ func TestInit(t *testing.T) {
Init(cfg) Init(cfg)
fmt.Println(Point) fmt.Println(Point)
Point.Add(&models.Point{ Point.Add(&models.Point{
UUID: "fake", UUID: "fake",
Client: &SocketClientMock{}, Client: &SocketClientMock{},
}) })
assert.Equal(t, 1 , Point.Clients.Len(), "MUST be same") assert.Equal(t, 1, Point.Clients.Len(), "MUST be same")
EspState.Add(&models.EspState{ EspState.Add(&models.EspState{
EspState: &schema.EspState {}, EspState: &schema.EspState{},
}) })
assert.Equal(t, 1 , EspState.State.Len(), "MUST be same") assert.Equal(t, 1, EspState.State.Len(), "MUST be same")
User.Add(&models.User{ User.Add(&models.User{
Alias: "fake", Alias: "fake",
}) })
assert.Equal(t, 1 , User.Users.Len(), "MUST be same") assert.Equal(t, 1, User.Users.Len(), "MUST be same")
Link.Add("fake-uuid", &models.Link{ Link.Add("fake-uuid", &models.Link{
User: "fake", User: "fake",
}) })
assert.Equal(t, 1 , Link.Links.Len(), "MUST be same") assert.Equal(t, 1, Link.Links.Len(), "MUST be same")
EspPolicy.Add(&models.EspPolicy{ EspPolicy.Add(&models.EspPolicy{
EspPolicy: &schema.EspPolicy{}, EspPolicy: &schema.EspPolicy{},
}) })
assert.Equal(t, 1 , EspPolicy.Policy.Len(), "MUST be same") assert.Equal(t, 1, EspPolicy.Policy.Len(), "MUST be same")
Online.Add(&models.Line{ Online.Add(&models.Line{
EthType: 0, EthType: 0,
}) })
assert.Equal(t, 1 , Online.Lines.Len(), "MUST be same") assert.Equal(t, 1, Online.Lines.Len(), "MUST be same")
Neighbor.Add(&models.Neighbor{ Neighbor.Add(&models.Neighbor{
Network: "fake", Network: "fake",
}) })
assert.Equal(t, 1 , Neighbor.Neighbors.Len(), "MUST be same") assert.Equal(t, 1, Neighbor.Neighbors.Len(), "MUST be same")
Reload() Reload()
assert.Equal(t, 0, EspState.State.Len(), "MUST be same") assert.Equal(t, 0, EspState.State.Len(), "MUST be same")
assert.Equal(t, 0 , EspPolicy.Policy.Len(), "MUST be same") assert.Equal(t, 0, EspPolicy.Policy.Len(), "MUST be same")
} }

32
pkg/config/esp_test.go
View File

@@ -10,15 +10,15 @@ func TestESPSpecifies(t *testing.T) {
State: EspState{ State: EspState{
Local: "3.3.3.1", Local: "3.3.3.1",
Crypt: "fake-crypt", Crypt: "fake-crypt",
Auth: "fake-auth", Auth: "fake-auth",
}, },
Members: []*ESPMember{ Members: []*ESPMember{
{ {
Peer: "1.1.1.0", Peer: "1.1.1.0",
Address: "1.1.1.1", Address: "1.1.1.1",
Spi: 0x01, Spi: 0x01,
State:EspState{ State: EspState{
Remote: "3.3.3.3", Remote: "3.3.3.3",
}, },
}, },
}, },
@@ -34,30 +34,30 @@ func TestESPSpecifies_GetMember(t *testing.T) {
State: EspState{ State: EspState{
Local: "3.3.3.1", Local: "3.3.3.1",
Crypt: "fake-crypt", Crypt: "fake-crypt",
Auth: "fake-auth", Auth: "fake-auth",
}, },
Members: []*ESPMember{ Members: []*ESPMember{
{ {
Peer: "1.1.1.0", Peer: "1.1.1.0",
Address: "1.1.1.1", Address: "1.1.1.1",
Spi: 123, Spi: 123,
State:EspState{ State: EspState{
Remote: "3.3.3.3", Remote: "3.3.3.3",
}, },
}, },
}, },
} }
spec.Correct() spec.Correct()
obj := spec.GetMember("spi:123") obj := spec.GetMember("spi:123")
assert.Equal(t, spec.Members[0], obj, "be the same.") assert.Equal(t, spec.Members[0], obj, "be the same.")
// Add // Add
{ {
mem1 := &ESPMember{ mem1 := &ESPMember{
Peer: "1.1.1.0", Peer: "1.1.1.0",
Address: "1.1.1.2", Address: "1.1.1.2",
Spi: 124, Spi: 124,
State:EspState{ State: EspState{
Remote: "3.3.3.4", Remote: "3.3.3.4",
}, },
} }
spec.AddMember(mem1) spec.AddMember(mem1)
@@ -79,12 +79,12 @@ func TestESPSpecifies_GetMember(t *testing.T) {
func TestESPSpecifies_AddPolicy(t *testing.T) { func TestESPSpecifies_AddPolicy(t *testing.T) {
mem := &ESPMember{ mem := &ESPMember{
Peer: "1.1.1.0", Peer: "1.1.1.0",
Address: "1.1.1.2", Address: "1.1.1.2",
Spi: 124, Spi: 124,
State:EspState{ State: EspState{
Local: "3.3.3.1", Local: "3.3.3.1",
Remote: "3.3.3.3", Remote: "3.3.3.3",
}, },
} }
mem.Correct() mem.Correct()

26
pkg/config/proxy_test.go
View File

@@ -6,23 +6,23 @@ import (
func TestNewProxy(t *testing.T) { func TestNewProxy(t *testing.T) {
obj := &Proxy{ obj := &Proxy{
Http: []*HttpProxy{ Http: []*HttpProxy{
{ {
Listen: "0.0.0.0:80", Listen: "0.0.0.0:80",
Cert: &Cert{ Cert: &Cert{
Dir: "/var/run", Dir: "/var/run",
},
}, },
}, },
}, Tcp: []*TcpProxy{
Tcp: []*TcpProxy{ {
{ Listen: "0.0.0.0:22",
Listen:"0.0.0.0:22", Target: []string{
Target: []string{ "1.1.1.1:23",
"1.1.1.1:23", "1.1.1.2:34",
"1.1.1.2:34", },
}, },
}, },
},
} }
obj.Correct() obj.Correct()
} }

6
pkg/switch/switch_test.go
View File

@@ -9,8 +9,10 @@ import (
func TestSwitch_LoadPass(t *testing.T) { func TestSwitch_LoadPass(t *testing.T) {
sw := &Switch{} sw := &Switch{}
sw.LoadPass("../../.password.no") cache.User.SetFile("../../.password.no")
sw.LoadPass("../../packaging/resource/password.example") sw.LoadPass()
cache.User.SetFile("../../packaging/resource/password.example")
sw.LoadPass()
for user := range cache.User.List() { for user := range cache.User.List() {
if user == nil { if user == nil {
break break