mail demo: removed antelope, added alpaca

6 files changed, 149 insertions, 149 deletions

diff --git a/hiera/antelope.yaml b/hiera/alpaca.yaml
index 500a5ff..181f604 100644
--- a/hiera/antelope.yaml
+++ b/hiera/alpaca.yaml
@@ -8,12 +8,7 @@ clamav:
 contacts: 
   - sysdev@leap.se
 couch: 
-  bigcouch: 
-    cookie: qYZj2DWkSeCRdInmdMP5Eg5xtcc8wuAp
-    ednp_port: 9002
-    epmd_port: 4369
-    neighbors: []
-  mode: multimaster
+  mode: plain
   port: 5984
   users: 
     admin: 
@@ -98,14 +93,20 @@ definition_files:
   smtp_service: |
       {
         "hosts": {
-          "antelope": {
-            "hostname": "antelope.mail.bitmask.net",
-            "ip_address": "199.119.112.167",
+          "alpaca": {
+            "hostname": "alpaca.mail.bitmask.net",
+            "ip_address": "199.119.112.223",
+            "location": "washington_d_c_",
             "port": 465
           }
         },
         "locations": {
-      
+          "washington_d_c_": {
+            "country_code": "US",
+            "hemisphere": "N",
+            "name": "Washington D.C.",
+            "timezone": "-5"
+          }
         },
         "serial": 1,
         "version": 1
@@ -113,14 +114,20 @@ definition_files:
   soledad_service: |-
       {
         "hosts": {
-          "antelope": {
-            "hostname": "antelope.mail.bitmask.net",
-            "ip_address": "199.119.112.167",
+          "alpaca": {
+            "hostname": "alpaca.mail.bitmask.net",
+            "ip_address": "199.119.112.223",
+            "location": "washington_d_c_",
             "port": 2323
           }
         },
         "locations": {
-      
+          "washington_d_c_": {
+            "country_code": "US",
+            "hemisphere": "N",
+            "name": "Washington D.C.",
+            "timezone": "-5"
+          }
         },
         "serial": 1,
         "version": 1
@@ -129,17 +136,17 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - antelope.mail.bitmask.net
+    - alpaca.mail.bitmask.net
     - api.mail.bitmask.net
     - mail.bitmask.net
     - nicknym.mail.bitmask.net
   public: true
 domain: 
-  full: antelope.mail.bitmask.net
+  full: alpaca.mail.bitmask.net
   full_suffix: mail.bitmask.net
-  internal: antelope.mail.bitmask.i
+  internal: alpaca.mail.bitmask.i
   internal_suffix: mail.bitmask.i
-  name: antelope.mail.bitmask.net
+  name: alpaca.mail.bitmask.net
 enabled: true
 environment: mail
 firewall: 
@@ -148,15 +155,15 @@ firewall:
     port: 
       - 25
       - 465
-    to: "199.119.112.167"
+    to: "199.119.112.223"
   soledad: 
     from: "*"
     port: 2323
-    to: "199.119.112.167"
+    to: "199.119.112.223"
   ssh: 
     from: sysadmin
     port: 22
-    to: "199.119.112.167"
+    to: "199.119.112.223"
   stunnel: []
   webapp: 
     from: "*"
@@ -165,26 +172,30 @@ firewall:
       - 4430
       - 6425
       - 80
-    to: "199.119.112.167"
+    to: "199.119.112.223"
 haproxy: 
   couch: 
     listen_port: 4096
     servers: 
-      antelope: 
+      alpaca: 
         backup: false
         host: localhost
         port: 5984
-        weight: 10
+        weight: 100
         writable: true
 hosts: 
-  antelope: 
-    domain_full: antelope.mail.bitmask.net
-    domain_internal: antelope.mail.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2YO7JEh12id6zSoAyq8uc1IIVpGMrv/JaNAX74R+nNdcFnezB2fZXDHr+FHdNg6Jfsy3KPTmNObWD/+T0HHcZVsuLULSKs/Drl/iYnfS9nzEoj9a2uS/Z4/kWAeCaiD8UoyXcB/4vi9Kq+NujtH9qHUM+FQJ3XSbJJYNqXucvl6i4mpGYS9E0piJJ6Nly26+OKTc9rT8x23vYWBtO7RDw+Z0fbfJKCd7KIgZvxukxDj+N/V6GxoyaybkzepR92q98xqMhZAiiuVLGpgI09Wc3YuKYCvOfNj6JFrKpDo52qJ2zaZXUPwS84b1aWhfwG7JV/T8qYqx4X03wn9fm+Scl"
-    ip_address: "199.119.112.167"
+  alpaca: 
+    domain_full: alpaca.mail.bitmask.net
+    domain_internal: alpaca.mail.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtpKckyjDgSw555znY6Ww2ZHzYZvNkf/dm6Xml4SVM4hFTUVIhgAuFXoUcMjwOcAzbnqPdZN/zGCzTGGBnPrw9YvwaP2oso1b/tysEGYvemvxJlLxo7wQKLbTj8u89LahGFZhoUBFxIX6u0f4gBFURGKHgotyjRJq5tM19CjgnO7L3lhjXl/04Zd5mmQPoHuGNi8wjxZVHLi+cbmG1qXFIXhqb1nDjq2dJh+NJGRZ4IrkkNYYB/V1RlQvHfJ6eof7pyVUWLwyOBe11DkyOooKl/pOkH4jVVCKP2Asbdu7nlqq6il88pQpL0CsikikWvMgWJ9TqafI2kBJ6QX484foH"
+    ip_address: "199.119.112.223"
     port: 22
-ip_address: "199.119.112.167"
-location: ~
+ip_address: "199.119.112.223"
+location: 
+  country_code: US
+  hemisphere: "N"
+  name: "Washington D.C."
+  timezone: "-5"
 mail: 
   smarthost: []
 mx: 
@@ -196,31 +207,28 @@ mx:
     selector: babcfe98e4
   key_lookup_domain: bitmask.net
 mynetworks: 
+  - "1.209.122.123"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
-  - "176.53.69.23"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.12"
-  - "199.119.112.149"
   - "199.119.112.150"
   - "199.119.112.151"
   - "199.119.112.152"
   - "199.119.112.153"
-  - "199.119.112.167"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
-  - "199.119.112.8"
+  - "199.119.112.223"
   - "204.13.164.171"
   - "204.13.164.57"
-  - "37.218.240.101"
+  - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
-name: antelope
+name: alpaca
 nickserver: 
   couchdb_nickserver_user: 
     password: bnrSIcLQ7dd7zVZv7vqR5HIYIhLsBmK5
@@ -318,19 +326,12 @@ ssh:
 stunnel: 
   clients: 
     couch_client: {}
-    ednp_clients: {}
-    epmd_clients: {}
   servers: 
     couch_server: 
       accept_port: 15984
       connect_port: 5984
-    ednp_server: 
-      accept_port: 19002
-      connect_port: 9002
-    epmd_server: 
-      accept_port: 14369
-      connect_port: 4369
 tags: 
+  - dc
   - mail
 webapp: 
   admins: 
@@ -463,39 +464,38 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
-      fw==
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE2MDMxNjAwMDAwMFoXDTE3
+      MDMxNjAwMDAwMFowIjEgMB4GA1UEAwwXYWxwYWNhLm1haWwuYml0bWFzay5uZXQw
+      ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE2SpNeqefr5gWdqKFxpGb
+      HZQ+vzehnZTEwGO6gmWWUR9qJqhE3DnYOsVON27YyM5kLnb+B4f2oDBqIdD4I+rU
+      xb3jfbqE8mhVm8KE8v4anUC+pwQM5PEVjbxBJX7CXuXqlhDvcGWJ+fyr285GzE65
+      3gSUUH8Nkz31bsLibmWdG9Y3SaR+4GOhjWVtSb1Ga96gdtZ51I+ZV5kPAXyfDl6o
+      bFZIBXYPO2HrxbXop9rTtDDOEeNezCzGcMP924KscOPjo6qllsRyRAC+Im5UzMzr
+      ktzoWUDzclSVG27xW+sJZwjzJGNL5Bx/6twseOz0moEU6Om3l6aHtgJO7nY2TJgm
+      plm4iUV4Vu3ubkxauX7E57jLxJU4HaTDvsELp4j2uJJ8Jpppo140D8ePby7QVr42
+      ImUqfWyQpDdy4Sp66IFqFdgO52A1UnX6koEgIkLJznTajOjoVWhamkl3J1Ol9KIT
+      ewFXFpOm19N97erb3stYJrXcna773HPI+MiIlXYXc2o/L09P7cdMZ2AWJIVdP4Oh
+      kU9F8QJx7qjCxLd+QabD1D809s5+6AbcgcmZdONpEbSYdvM0G94DQq6FR1j0fb9N
+      6BFiUpkGIcY3FLV/64DNNvHmymEeDSmwjldTKgJuvOG7ZABvXXDs4PX4PBrBAtlp
+      P70ARkXWFgAQnLMnFBU7+wIDAQABo4H+MIH7MB0GA1UdDgQWBBRVi+6N2e41TAbN
+      yWqrkTyVR06lPTCBgQYDVR0RBHoweIIVYWxwYWNhLm1haWwuYml0bWFzay5pghdh
+      bHBhY2EubWFpbC5iaXRtYXNrLm5ldIIUYXBpLm1haWwuYml0bWFzay5uZXSCEG1h
+      aWwuYml0bWFzay5uZXSCGG5pY2tueW0ubWFpbC5iaXRtYXNrLm5ldIcEx3dw3zAL
+      BgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAkGA1Ud
+      EwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcN
+      AQELBQADggIBAJRYh2XrC5Sa/qzk2qFCfZ44vqYLsJfPP0Y/5y4izOtzGPJHoxpZ
+      RqRJxiEjWCTA6fxAXlbwDGWsms4yZribiw6WHuwjlcwnCCZWNTJbJ6g6jLSuYm4i
+      7s8TLw2srLGVOXtwcbruo121Y5Ybr1tPt6rVZ9hF7syL0UoEFHDpq1jqHQmUX33o
+      dI230PQgrwFuncqEJsPT0lfUVUyyb6kb1sUUqOgX8szz/lMdfmmcAKxdUAoQlu31
+      E3QnPxVerbgEbIRXxWMn1eZCR2IaBJLq2lCjWk8gS2Yc7wD5fqzaRsn6Bdfic/nB
+      RP6x3gUzBycEZgciXkzDG7FEizJzAnD5Wj27YQyQmzxgl2+blDC9i/waVCiv3fYm
+      AGbn5owYgAwAxEtnt/T3DbeptmxGK+HkLgmM4QdTVy4r/Ren5ARMVcTDySe2en3n
+      6UvurTthNKmQTIBBe1ymYrwx7iPbaO9D2gP5BoXTsihClg2qC8BSD9xshj2kmqZH
+      OGIoBOcvhmFGYdHxPtzDU35rQ36HcsmkKTLB2saulrXP5TxqhwV7rzu8ei5KZdOK
+      NqyNXwa9BOxD+r0qaAgwjQNNNxbCyQWM7FdWMRQdcBMxnmnY6P2zLaOlEHgi6eMn
+      vP80CeDyUIaQl95PYj3fuX9GMSsozykZwscCi5D5p/w74LUq3fyg9W1P
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -742,55 +742,55 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 70b9f8b..2b96f38 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -82,11 +82,11 @@ mynetworks:
   - "199.119.112.151"
   - "199.119.112.152"
   - "199.119.112.153"
-  - "199.119.112.167"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
+  - "199.119.112.223"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"
diff --git a/hiera/cowbird.yaml b/hiera/cowbird.yaml
index 6c62ace..fbfa123 100644
--- a/hiera/cowbird.yaml
+++ b/hiera/cowbird.yaml
@@ -83,11 +83,11 @@ mynetworks:
   - "199.119.112.151"
   - "199.119.112.152"
   - "199.119.112.153"
-  - "199.119.112.167"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
+  - "199.119.112.223"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 8944141..986eb4c 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -189,18 +189,18 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv"
     ip_address: "199.119.112.205"
     port: 22
+  alpaca: 
+    domain_full: alpaca.mail.bitmask.net
+    domain_internal: alpaca.mail.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtpKckyjDgSw555znY6Ww2ZHzYZvNkf/dm6Xml4SVM4hFTUVIhgAuFXoUcMjwOcAzbnqPdZN/zGCzTGGBnPrw9YvwaP2oso1b/tysEGYvemvxJlLxo7wQKLbTj8u89LahGFZhoUBFxIX6u0f4gBFURGKHgotyjRJq5tM19CjgnO7L3lhjXl/04Zd5mmQPoHuGNi8wjxZVHLi+cbmG1qXFIXhqb1nDjq2dJh+NJGRZ4IrkkNYYB/V1RlQvHfJ6eof7pyVUWLwyOBe11DkyOooKl/pOkH4jVVCKP2Asbdu7nlqq6il88pQpL0CsikikWvMgWJ9TqafI2kBJ6QX484foH"
+    ip_address: "199.119.112.223"
+    port: 22
   ant: 
     domain_full: ant.demo.bitmask.net
     domain_internal: ant.demo.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI="
     ip_address: "198.252.153.82"
     port: 4422
-  antelope: 
-    domain_full: antelope.mail.bitmask.net
-    domain_internal: antelope.mail.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2YO7JEh12id6zSoAyq8uc1IIVpGMrv/JaNAX74R+nNdcFnezB2fZXDHr+FHdNg6Jfsy3KPTmNObWD/+T0HHcZVsuLULSKs/Drl/iYnfS9nzEoj9a2uS/Z4/kWAeCaiD8UoyXcB/4vi9Kq+NujtH9qHUM+FQJ3XSbJJYNqXucvl6i4mpGYS9E0piJJ6Nly26+OKTc9rT8x23vYWBtO7RDw+Z0fbfJKCd7KIgZvxukxDj+N/V6GxoyaybkzepR92q98xqMhZAiiuVLGpgI09Wc3YuKYCvOfNj6JFrKpDo52qJ2zaZXUPwS84b1aWhfwG7JV/T8qYqx4X03wn9fm+Scl"
-    ip_address: "199.119.112.167"
-    port: 22
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
@@ -362,6 +362,18 @@ nagios:
         - couchdb
         - soledad
       ssh_port: 22
+    alpaca: 
+      domain_full_suffix: mail.bitmask.net
+      domain_internal: alpaca.mail.bitmask.i
+      domain_internal_suffix: mail.bitmask.i
+      environment: mail
+      ip_address: "199.119.112.223"
+      services: 
+        - couchdb
+        - mx
+        - soledad
+        - webapp
+      ssh_port: 22
     ant: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: ant.demo.bitmask.i
@@ -372,18 +384,6 @@ nagios:
         - couchdb
         - soledad
       ssh_port: 4422
-    antelope: 
-      domain_full_suffix: mail.bitmask.net
-      domain_internal: antelope.mail.bitmask.i
-      domain_internal_suffix: mail.bitmask.i
-      environment: mail
-      ip_address: "199.119.112.167"
-      services: 
-        - couchdb
-        - mx
-        - soledad
-        - webapp
-      ssh_port: 22
     cat: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: cat.unstable.bitmask.i
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index a15d6af..364b040 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -83,11 +83,11 @@ mynetworks:
   - "199.119.112.151"
   - "199.119.112.152"
   - "199.119.112.153"
-  - "199.119.112.167"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
+  - "199.119.112.223"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 60363a1..0e9a4ff 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -89,11 +89,11 @@ mynetworks:
   - "199.119.112.151"
   - "199.119.112.152"
   - "199.119.112.153"
-  - "199.119.112.167"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
+  - "199.119.112.223"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"