summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
Diffstat (limited to 'smoketest')
-rw-r--r--smoketest/configs/service-https55
-rw-r--r--smoketest/configs/vpn-openconnect-sstp1
-rwxr-xr-xsmoketest/scripts/cli/test_service_dns_forwarding.py2
3 files changed, 2 insertions, 56 deletions
diff --git a/smoketest/configs/service-https b/smoketest/configs/service-https
deleted file mode 100644
index d478d5731..000000000
--- a/smoketest/configs/service-https
+++ /dev/null
@@ -1,55 +0,0 @@
-interfaces {
- ethernet eth0 {
- address 192.168.150.1/24
- }
-}
-service {
- https {
- certificates {
- system-generated-certificate {
- lifetime 365
- }
- }
- }
-}
-system {
- config-management {
- commit-revisions 100
- }
- console {
- device ttyS0 {
- speed 115200
- }
- }
- host-name vyos
- login {
- user vyos {
- authentication {
- encrypted-password $6$2Ta6TWHd/U$NmrX0x9kexCimeOcYK1MfhMpITF9ELxHcaBU/znBq.X2ukQOj61fVI2UYP/xBzP4QtiTcdkgs7WOQMHWsRymO/
- plaintext-password ""
- }
- }
- }
- ntp {
- server time1.vyos.net {
- }
- server time2.vyos.net {
- }
- server time3.vyos.net {
- }
- }
- syslog {
- global {
- facility all {
- level info
- }
- facility protocols {
- level debug
- }
- }
- }
-}
-
-// Warning: Do not remove the following line.
-// vyos-config-version: "bgp@1:broadcast-relay@1:cluster@1:config-management@1:conntrack@2:conntrack-sync@2:dhcp-relay@2:dhcp-server@5:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@22:ipoe-server@1:ipsec@6:isis@1:l2tp@3:lldp@1:mdns@1:nat@5:nat66@1:ntp@1:policy@1:pppoe-server@5:pptp@2:qos@1:quagga@9:rpki@1:salt@1:snmp@2:ssh@2:sstp@3:system@21:vrf@2:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webproxy@2:zone-policy@1"
-// Release version: 1.4-rolling-202106290839
diff --git a/smoketest/configs/vpn-openconnect-sstp b/smoketest/configs/vpn-openconnect-sstp
index 45e6dd9b2..59a26f501 100644
--- a/smoketest/configs/vpn-openconnect-sstp
+++ b/smoketest/configs/vpn-openconnect-sstp
@@ -75,6 +75,7 @@ vpn {
subnet 192.168.170.0/24
}
gateway-address 192.168.150.1
+ port 8443
ssl {
ca-cert-file /config/auth/ovpn_test_ca.pem
cert-file /config/auth/ovpn_test_server.pem
diff --git a/smoketest/scripts/cli/test_service_dns_forwarding.py b/smoketest/scripts/cli/test_service_dns_forwarding.py
index 65b676451..fe2682d50 100755
--- a/smoketest/scripts/cli/test_service_dns_forwarding.py
+++ b/smoketest/scripts/cli/test_service_dns_forwarding.py
@@ -26,7 +26,7 @@ from vyos.util import process_named_running
CONFIG_FILE = '/run/powerdns/recursor.conf'
FORWARD_FILE = '/run/powerdns/recursor.forward-zones.conf'
HOSTSD_FILE = '/run/powerdns/recursor.vyos-hostsd.conf.lua'
-PROCESS_NAME= 'pdns-r/worker'
+PROCESS_NAME= 'pdns_recursor'
base_path = ['service', 'dns', 'forwarding']