diff --git a/pro/01_hostname-and-interfaces.t b/pro/01_hostname-and-interfaces.t index b189ff1..f788ad9 100755 --- a/pro/01_hostname-and-interfaces.t +++ b/pro/01_hostname-and-interfaces.t @@ -46,7 +46,7 @@ sub main { diag 'fqdn hostname - ', $hostname_fqdn if $ENV{TEST_VERBOSE}; - isnt($hostname_short, $hostname_fqdn, 'short hostname should not be the same as fqdn'); + is($hostname_short, $hostname_fqdn, 'short hostname should be the same as fqdn'); # short hostname from fqdn my ($short) = split /\./, $hostname_fqdn; diff --git a/pro/03_sites-ok.t b/pro/03_sites-ok.t index d714b76..ac4c02e 100755 --- a/pro/03_sites-ok.t +++ b/pro/03_sites-ok.t @@ -26,6 +26,7 @@ use Test::Differences; use YAML::Syck 'LoadFile'; use FindBin '$Bin'; +BEGIN { $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0 } eval "use Test::WWW::Mechanize"; plan 'skip_all' => "need Test::WWW::Mechanize to run web tests" if $@; diff --git a/pro/test-server.yaml b/pro/test-server.yaml index 793acd1..bd71b55 100644 --- a/pro/test-server.yaml +++ b/pro/test-server.yaml @@ -10,32 +10,35 @@ disk-free: running-processes: should-run: - - /bin/bash /usr/sbin/ngcp-kamctl proxy fifo get_statistics :dialog::active_dialogs - /bin/sh -c /usr/bin/logger -p daemon.info -t csc - /bin/sh -c /usr/bin/logger -p daemon.info -t oss - /bin/sh /usr/bin/mysqld_safe - collectd -C /etc/collectd/collectd.conf -f - "heartbeat: master control process" - rate-o-mat + - /sbin/getty 38400 tty1 - udevd --daemon - /usr/bin/logger -p daemon.info -t csc + - /usr/bin/logger -p daemon.info -t ngcp-panel - /usr/bin/logger -p daemon.info -t oss + - /usr/bin/lua5.1 /usr/bin/prosody - /usr/bin/mediator + - /usr/bin/monit - /usr/bin/redis-server - - /usr/lib/heartbeat/ipfail + - /usr/lib64/heartbeat/ipfail - /usr/sbin/acpid - /usr/sbin/apache2 - /usr/sbin/asterisk -n - /usr/sbin/collectdmon - /usr/sbin/cron - /usr/sbin/exim4 - - /usr/sbin/glusterfsd + - /usr/sbin/glusterd - /usr/sbin/glusterfs + - /usr/sbin/glusterfsd - /usr/sbin/haveged -w 1024 - /usr/sbin/kamailio -f /etc/kamailio/lb/kamailio.cfg -P /var/run/kamailio/kamailio.lb.pid - /usr/sbin/kamailio -f /etc/kamailio/proxy/kamailio.cfg -P /var/run/kamailio/kamailio.proxy.pid - /usr/sbin/mediaproxy-ng - - /usr/sbin/monit - /usr/sbin/mysqld - /usr/sbin/ntpd - /usr/sbin/rsyslogd @@ -61,11 +64,13 @@ open-ports: 3306: mysqld # 4569: asterisk # TODO udp # 5040: sems # TODO udp + 5060: kamailio 5062: kamailio # 5070: asterisk # TODO udp # 5080: sems # TODO udp + 5222: prosody + 5269: prosody 6996: glusterfs - 8000: kamailio 8090: sems # 25826: collectd + kamailio # TODO udp # 40297: collectd # TODO udp @@ -95,7 +100,6 @@ sites-ok: title: "Sipwise NGCP CSC" content: "Self-Administration Login" https://localhost:1443/: - title: "Sipwise NGCP admin interface" - content: "Sipwise NGCP Administration Interface" + content: "Admin Sign In" https://localhost:2443/SOAP/Provisioning.wsdl: content: "xmlns:tns=\"http://dev.sipwise.com/SOAP/Provisioning\""