diff options
| author | Steve Kemp <steve@steve.org.uk> | 2012-11-26 15:40:43 +0000 |
|---|---|---|
| committer | Steve Kemp <steve@steve.org.uk> | 2012-11-26 15:40:43 +0000 |
| commit | 70f1bba117b384772e5ad22acd10057999d52e64 (patch) | |
| tree | bb55db7a1ea3cfa226be1a7424c4c764b43edf84 | |
| parent | 698ebcefc5b7185e25bd84698dd1c01bec8510c9 (diff) | |
Updated the sample configuration file to have more examples - and
removed the redundant files.
| -rw-r--r-- | cfg/dns.cfg | 8 | ||||
| -rw-r--r-- | cfg/sample.cfg | 42 | ||||
| -rw-r--r-- | cfg/tcp.cfg | 15 |
3 files changed, 41 insertions, 24 deletions
diff --git a/cfg/dns.cfg b/cfg/dns.cfg deleted file mode 100644 index 894e8a5..0000000 --- a/cfg/dns.cfg +++ /dev/null @@ -1,8 +0,0 @@ -DNSHOSTS is a.ns.bytemark.co.uk and b.ns.bytemark.co.uk and c.ns.bytemark.co.uk. - -DNSHOSTS must run dns for bytemark.co.uk resolving NS as '80.68.80.26;85.17.170.78;80.68.80.27'. -DNSHOSTS must run dns for www.bytemark.co.uk resolving A as '212.110.161.177'. -DNSHOSTS must run dns for bytemark.co.uk resolving MX as '89.16.184.148;89.16.184.149;89.16.184.150'. -DNSHOSTS must run dns for support.bytemark.co.uk resolving MX as '89.16.184.148;89.16.184.149;89.16.184.150'. -DNSHOSTS must run dns for admin.bytemark.co.uk resolving A as '212.110.161.144'. -DNSHOSTS must run dns for bytemark-hosting.co.uk resolving A as '212.110.161.177'. diff --git a/cfg/sample.cfg b/cfg/sample.cfg index ff5abc6..e6a0325 100644 --- a/cfg/sample.cfg +++ b/cfg/sample.cfg @@ -43,9 +43,49 @@ mirror.bytemark.co.uk must run ftp otherwise 'mirror ftp failure'. mirror.bytemark.co.uk must run rsync otherwise 'mirror rsync failure'. mirror.bytemark.co.uk must run ping otherwise 'mirror ping failure'. - +# # Ensure the Bytemark blog is active # blog.bytemark.co.uk must ping otherwise 'blog failure?'. http://blog.bytemark.co.uk/ must run http with content 'Bytemark Blog' otherwise 'blog is not available'. + +# +# Define a macro for the Bytemark DNS servers +# +DNSHOSTS is a.ns.bytemark.co.uk and b.ns.bytemark.co.uk and c.ns.bytemark.co.uk. + +# +# Test that they return valid things. +# +DNSHOSTS must run dns for bytemark.co.uk resolving NS as '80.68.80.26;85.17.170.78;80.68.80.27'. +DNSHOSTS must run dns for www.bytemark.co.uk resolving A as '212.110.161.177'. +DNSHOSTS must run dns for bytemark.co.uk resolving MX as '89.16.184.148;89.16.184.149;89.16.184.150'. +DNSHOSTS must run dns for support.bytemark.co.uk resolving MX as '89.16.184.148;89.16.184.149;89.16.184.150'. +DNSHOSTS must run dns for admin.bytemark.co.uk resolving A as '212.110.161.144'. +DNSHOSTS must run dns for bytemark-hosting.co.uk resolving A as '212.110.161.177'. + + + +# +# TCP-protocol tests. +# +# The "tcp" probe is a general-purpose one that attempts to connect to the host-specified, +# on the port-specified, and optionally look for some text in the banner returned from that +# connection. +# +# Here you'll see we've duplicated two other protocol tests: +# +# mail.steve.org.uk must run smtp otherwise 'email fail'. +# ssh.steve.org.uk must run ssh on 2222 otherwise 'ssh fail'. +# + +# SMTP +# +mail.steve.org.uk must run tcp on 25 with banner 'smtp' otherwise 'mail fail'. + +# +# SSH +# +ssh.steve.org.uk must run tcp on 2222 with banner 'ssh' otherwise 'ssh fail'. + diff --git a/cfg/tcp.cfg b/cfg/tcp.cfg deleted file mode 100644 index 0da1c81..0000000 --- a/cfg/tcp.cfg +++ /dev/null @@ -1,15 +0,0 @@ - -# -# TCP-protocol tests. -# - - -# -# SMTP -# -mail.steve.org.uk must run tcp on 25 with banner 'smtp' otherwise 'mail fail'. - -# -# SSH -# -ssh.steve.org.uk must run tcp on 2222 with banner 'ssh' otherwise 'ssh fail'. |