recompile development and unstable with new sorted yaml leap_cli

7 files changed, 219 insertions, 227 deletions

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index e10047b..cdfe90e 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -137,10 +137,10 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - chameleon.unstable.bitmask.net
-    - unstable.bitmask.net
     - api.unstable.bitmask.net
+    - chameleon.unstable.bitmask.net
     - nicknym.unstable.bitmask.net
+    - unstable.bitmask.net
   public: true
 domain: 
   full: chameleon.unstable.bitmask.net
@@ -306,8 +306,8 @@ nagios:
       domain_internal: chameleon.unstable.bitmask.i
       ip_address: "199.119.112.10"
       services: 
-        - webapp
         - monitor
+        - webapp
       ssh_port: 4422
     chipmonk: 
       domain_full_suffix: cdev.bitmask.net
@@ -470,8 +470,8 @@ nickserver:
   port: 6425
 service_type: public_service
 services: 
-  - webapp
   - monitor
+  - webapp
 ssh: 
   authorized_keys: 
     azul: 
@@ -528,18 +528,18 @@ stunnel:
         original_port: 5984
   servers: {}
 tags: 
-  - unstable
   - dc
   - sandbox-braintree
+  - unstable
 webapp: 
   admins: 
+    - azul
     - elijah
-    - varac
-    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - azul
+    - micah
+    - varac
   allow_anonymous_certs: false
   allow_limited_certs: false
   allow_registration: true
@@ -573,9 +573,9 @@ webapp:
     revision: origin/develop
     source: "https://leap.se/git/leap_web"
   modules: 
-    - user
     - billing
     - help
+    - user
   nagios_test_user: 
     password: SvVjM5NCe2RF6XwTtZ7dGxAZ7E7KeSNS
     username: nagios_test
@@ -622,34 +622,34 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFOzCCAyOgAwIBAgIRAJdhTXZEscHp6QSMkwp4VOcwDQYJKoZIhvcNAQELBQAw
+      MIIFGzCCAwOgAwIBAgIRAOVEh2wT90YhU+VJSKJ8gbIwDQYJKoZIhvcNAQELBQAw
       SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MDQwODAwMDAwMFoXDTE1
-      MDQwODAwMDAwMFowKTEnMCUGA1UEAwweY2hhbWVsZW9uLnVuc3RhYmxlLmJpdG1h
-      c2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0vL/B0PwJrre
-      VwAB+jYtxdG0048OLGEmENH9SPJsbvgd0c6pe6ydGvZR9QzoAWXVH+PzGF8wOBQc
-      Nu1BXuwOzqUgpCAuz4bwuWJC1GlacWf0wfORa7Cr2hko65r4OEEaocxQM8XYLhqk
-      l/clkKPhQEf4AHKLEyco51ICC/vYuaSIUP1YUYeIHdFpBTCHvnld0aw8oVlDqf6u
-      M6JAxO5N61OY2O2k37UnwHxJgjtjVKsmiTyKvnCQLNUIYUsh7ROnU3K9gAU1MJ8p
-      0JRjv520e+CQiO+6buwTudEFoLlTwDTpD5/RSGnPGzdjttypHsG3W8alu8KnnFuz
-      gn6YbMdx8QIDAQABo4IBOzCCATcwHQYDVR0OBBYEFFhlfOTgHu8/sDHEAT+QykoL
-      zVK7MIG9BgNVHREEgbUwgbKCHGNoYW1lbGVvbi51bnN0YWJsZS5iaXRtYXNrLmmC
-      HmNoYW1lbGVvbi51bnN0YWJsZS5iaXRtYXNrLm5ldIIUdW5zdGFibGUuYml0bWFz
-      ay5uZXSCHmNoYW1lbGVvbi51bnN0YWJsZS5iaXRtYXNrLm5ldIIYYXBpLnVuc3Rh
-      YmxlLmJpdG1hc2submV0ghxuaWNrbnltLnVuc3RhYmxlLmJpdG1hc2submV0hwTH
-      d3AKMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-      CQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkq
-      hkiG9w0BAQsFAAOCAgEAFMDvWJhgZw3g0+I8RkELpw0lALJSMO4HNxpt1qWs1k2r
-      HpNpOpKJBHYjnNfqQThzcDPs63oenV9oxhtLN5IJ3SX3si0zf+Z0pj4IeeqCbGeh
-      6mszXiLOYdSXYvuQKedqGgoy+qYpvt49uVKNWdbaidPgH90wkoNL1/58azFVU2HT
-      pj7DiArkwAIebYn4LOtYZV02Aw/mkVGzyMGVCoaUCba1S/VCfvuaWqG96bAjhq9O
-      CDSD0QCiKgApWinyVNNurTsYCtpi8JB/3CKZneO9cEgkXt5kvQOlNFziLErOuGWS
-      6/Wvgp3n/M5xqW8U6K3C2awOLl07vybg+g18eAzfWalDdPf5x/kKKXRXyFnSVCcM
-      5xJX6dqFHM354v8dbg/LO5z3cX93M+F+JmlRfqLvsiOEJyGAy7twP0eLbOuHOGo3
-      IdEZ0nD4WXEEG1Ov84CPXr0B7B0enveJD5zc1kG4Yn2c2tVlsIAaSvgDcQxeyJtl
-      508Nob7GzCzXLHNs/+N7SoCvGYeKFGIhStMaa1vcRtYD7fbAoyIxbOrzj8295ckB
-      lh9gT41AkOL206sgf6EAH7ZNbpZut3MdxPlh0PEKweq1fti6oCeOna+Mskbv6jGG
-      2RzS4mkJxlKv+4jM3XbtXLPYfooN7Ic1yD0nUssy4VORD14xNfBboFOZL1MTnLs=
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MTAwMjAwMDAwMFoXDTE1
+      MTAwMjAwMDAwMFowKTEnMCUGA1UEAwweY2hhbWVsZW9uLnVuc3RhYmxlLmJpdG1h
+      c2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw88ChV9HiLyj
+      WEPlYFAR33CHvprKrmudFGkDsaX7Zio5wZx3Rsp4n/3LQUV8T8Ap9fGtD2Uf3dri
+      JwyxL61szAXSlEvWdDUQO02MG4MuZXCW7ZT8EnoYnAnW33HAvoMbs2/wxzT/7Wfh
+      WboLPBLtW+x1yda1U7z5EUPB7s2UeOEgUMRLFjm/BjOKDeyW7FQznuYtVR8CnWYh
+      +MX5FaJz0se3VQWdo+XucFsIgCt/V/GAnouYXtXAhP/zOE+u0cHoMNMww8cSbS4I
+      ecfSt9DfCvN3wu7DtjEx4k3qpXf1rlgGgWidRfMmEXRsTyo6qZXmaT0CUPhGkOQZ
+      pik6vA8AyQIDAQABo4IBGzCCARcwHQYDVR0OBBYEFEsVQsiZJezjg2c2jVoeJx32
+      S1xRMIGdBgNVHREEgZUwgZKCGGFwaS51bnN0YWJsZS5iaXRtYXNrLm5ldIIcY2hh
+      bWVsZW9uLnVuc3RhYmxlLmJpdG1hc2suaYIeY2hhbWVsZW9uLnVuc3RhYmxlLmJp
+      dG1hc2submV0ghxuaWNrbnltLnVuc3RhYmxlLmJpdG1hc2submV0ghR1bnN0YWJs
+      ZS5iaXRtYXNrLm5ldIcEx3dwCjALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
+      BQUHAwEGCCsGAQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnY
+      pHHvProt1JU+D48wDQYJKoZIhvcNAQELBQADggIBAK/eZMQKTYeGK3nRur4TKfJx
+      WfSIAM2pd/QiBe2p4jhsJ6rt/hLYYPW1JNEdKEGZJhffh+eVqQrFmffS7xPv4ocr
+      ja18DaG+RlWLHAbMFYLpj6PL0Ip6wC7OaKlnn4e43xYnqR3X0gKIus4AxrI0KofF
+      cSWMwdTFfUZC5b92poqYeAyCXD7URXmT7kokBMMtbNdGcnoZk+6YsracTKFN7wCM
+      t6aEKlmrYyBIyTJgLL+MulKnLJ1aW3mlNad1jXc51SOko20dqUN5satUFndVrtIm
+      G7mFDg9xvWIFFglCIWCCMflSFgE4TlZPVu9ZyJhauL3EpWQFJpGbE6v5DOqCzGMX
+      eTHjdUhyjPWE6S/q3BUlssVAezoFofuNyPQO7QtKAGK/4kECdEMpX7MD67wZsUO4
+      B84L1rfNkTZT00fpcYmDsY0MoMbkmy7Zn8YyyMI+4k3TtTWl7OT83Rs7wNk2qWJ7
+      dKbk9dNZQutFJYH9TsUyt6R7te5jOsIzPQTHlR8g99QeqBFR9FXUzZSAkMf3y0Zy
+      uW9ooH/z+wbqoAkqADTet28uhCUAJs0njFoAZhBegf6IYg7ZU3DQ5r99Vjn9n9Au
+      0j0AdFQC2DB1RAdf/tjXUXrDu+gcAynXoocWQizPVvu3K5ipO1M34lxUi8UmugZ9
+      e194G5pRf1PVcSIkQ9rd
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -807,90 +807,86 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFHDCCAwSgAwIBAgIDDsnRMA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
-      b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-      Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-      dEBjYWNlcnQub3JnMB4XDTE0MDQwODE2NTc1NVoXDTE0MTAwNTE2NTc1NVowHzEd
-      MBsGA1UEAxMUdW5zdGFibGUuYml0bWFzay5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-      A4IBDwAwggEKAoIBAQDnHiuopoBHKl9dEorwQGx6/UqRHoeBqn79mUuAM35gLGvG
-      d0XvBzsFVHOz4pnkqAHavWAwuybiy2RKNd+sBBJTG0u7gzrOnmQkPHSQGg0gTZGq
-      i+RAxJPzcTbyGhXzTQerHRSOFV2+nOkyiqqFjchDjSA8WrDH/XMx+mtZK6/lhhjF
-      c6j083+vE8XKrA+b2oXvpp2E2n/wG1pEW8E6dRk60vdbR879ERE0G2jVsxWepa9k
-      HJ2HtgW7eoorVFhnDClTRVqvrowTZ/UZaZqkO9baWVVwR0KFgEHOzJNAxVAgtuqV
-      3tqhfsmAfV2vcXn5wXFePAWm+l6bN4Jn6HjIggcdAgMBAAGjggEFMIIBATAMBgNV
-      HRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYI
-      KwYBBQUHAwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUw
-      IwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgw
-      JqAkoCKGIGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMEMGA1UdEQQ8
-      MDqCFHVuc3RhYmxlLmJpdG1hc2submV0oCIGCCsGAQUFBwgFoBYMFHVuc3RhYmxl
-      LmJpdG1hc2submV0MA0GCSqGSIb3DQEBDQUAA4ICAQCPEsr+VXzaabzjlGsoyVif
-      SWIXeIAican1kSl7zNanMg60RogEw7D9B7t+YmAAXL3hwPYJyACp3vWFupbYiRYx
-      n6YqMEaxDmrHp1oiXrPrFcQ/SaGhD+KdPV7NjYQEQchHeEj4NGhl9f8UoNxB/ixx
-      uzj6ocN3SmVifw5EDMtvlJmV6sjjro+vz9UzJn8p4KyPLow7j/Ik2UxzXOj10t+b
-      EHtQoUS7HMFD9jWbdzAjAC5/5gbHu8csMAW0yexdgSPik7HA6rlgzcYZ9pYM9e7R
-      mLhbYHaOln50ixGRK7InVY/n/XKLA26TOzwewwsQdu25UtBWxlTSVPPrvRrBMku5
-      lpX1v3IzwR0E9I33Lgu5LRiFX7IldKDibu/r4uvZsCxGr0PPl3PQookrD7+siLHa
-      SnVSVAhi947uu/K45GXDyGfPs0HRYIWpCclnSrq33muSgQQlgNTQ+/h1WrCPW1L7
-      8Llrjiqv8gPcTvREJa5cFBUOC7lmEX5P9LBpOdy7N47Bd9TXIZAKTvFaBbmcaLoz
-      7CnsbC0clW8gCGiP+Q1bTYdjoHD0XjPcmRNMucmfFy+/oUCin4vKLYfDR7X1TO/E
-      PBq3v+dUudr+DDPc3JAShVbgVWCvfZm68DQ0Jly6z++HJ3S2c/yYALsdYwkID2LL
-      mxZwnhZYUW01D1peAX5BNA==
+      MIIEdDCCAlygAwIBAgIQWW5S+JG3Fr6DInjm7VQ7UjANBgkqhkiG9w0BAQsFADBK
+      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
+      MDAyMDAwMDAwWjAxMRAwDgYDVQQKDAdCaXRtYXNrMR0wGwYDVQQDDBR1bnN0YWJs
+      ZS5iaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfS
+      Asf/zPXdD+M2Zp1Pcps3DdyElsAvK2IqaStVKVx9oEETTlDUciUkhtO2CmKsszEn
+      SkvYKM6QsiffarwSe7QIBZBQxXYjGqP9IPhpTt9JPuabJGeZIIu6Pc/odbR9kHYA
+      qIoSGb97JlPsd1Q38q+9WRZdGINIgpHwWmsEe/3fXdy6F2WSdsYI+LLlRmNpi9FU
+      l7sUuXgjyjEvmqzRR001/xglV/8xRDkWZ0R/phQk3KMMexB1STjC9ZyT3+N7SQWP
+      PiC/pus5Aqo5CuknJTNn6bwbPPaCEMqG0U19l33HbZua48QyxYTGz9BSKLt7+77I
+      koJ7H1E5CVOPC46rqUkCAwEAAaNvMG0wHQYDVR0OBBYEFNaC7Y+9eGMFw4b02rfZ
+      DKRoifxAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAJBgNVHRME
+      AjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEB
+      CwUAA4ICAQBSACTOk/lidgImS9KsoRBdmM1kdWhD+FY3RYSpZF8CPr4W1UdPn0GZ
+      C1hGTXZ6fC/muQpZ8IFtNXMnmKnyQ6hw2wBoM/yk8bgyMVOIuRJQ/X4PTdIMrkXT
+      CKsqhzfddob+Gf2XA2/z6MyOKsL2mIJZchAqzZDQDezWzOvb/FP2gUyiiEvBgs2U
+      Re5jgixCKQd8YZ+AZLo6TPM/5JLJoTeRtd2JJyhMuJvLdZGKY8oSlu1TryK9uMB6
+      LxbYsHOjfQd1y3odvq8TPP++AMwAEzYsQm6LNzr6G2DrfFYWmItIbCyE2slAarzu
+      LcaJM8l6tzVYU3qsc+Dwi1a1yIqle3mPmwPf8PYYExIE3aqAD0n9jjJbB8XQ/N2E
+      5Uit63hahzBarvBDxvjh53teElBDvX0G6tgFQHdiZYY+DtMWMpADl5m7kquCfY80
+      HHxBbP7tt55LdZu0N/9CkNdKkeStaDTb4+sSg0A+mXz0IU4zE2aufuWcFsdG/3cQ
+      PuRM7u9dBpD6qPRVw0pw+a6z+6OxaldiuJds+c15taDgab6rLYOPcmxNfFW9qdgA
+      dyRrHeMHcjToYJKQmMtB8VH1HdIUT0WyZlibKj3YBhPIExNLJk83rfF9W72zGUbI
+      0MVbrOyfza0ePv2ngWZlZIhnRBO3iWEn7UNhfBqin8pDuQfDAdgSvg==
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      MIIEpQIBAAKCAQEAt9ICx//M9d0P4zZmnU9ymzcN3ISWwC8rYippK1UpXH2gQRNO
+      UNRyJSSG07YKYqyzMSdKS9gozpCyJ99qvBJ7tAgFkFDFdiMao/0g+GlO30k+5psk
+      Z5kgi7o9z+h1tH2QdgCoihIZv3smU+x3VDfyr71ZFl0Yg0iCkfBaawR7/d9d3LoX
+      ZZJ2xgj4suVGY2mL0VSXuxS5eCPKMS+arNFHTTX/GCVX/zFEORZnRH+mFCTcowx7
+      EHVJOML1nJPf43tJBY8+IL+m6zkCqjkK6SclM2fpvBs89oIQyobRTX2Xfcdtm5rj
+      xDLFhMbP0FIou3v7vsiSgnsfUTkJU48LjqupSQIDAQABAoIBAQCYUEw9rJgIocQo
+      YUtlzg8IzfWOY88GMA+ip8G9RjOfj/jZ80VRdLegT0Po6U5xtOhGMmg9sD8f6oW0
+      xEuMy0P1STBTBJqZ6TyJ5ZUMQTY5jlewfZ0MurVdElVlkRj3FZQ+Mw10Wss6/rAj
+      mizGfBV7yUmoXjuRjOOkSaSiSHT1RlakOYSnoEtbsolkKEhswYx9SasV1a+BjO4x
+      nWfxmRrXaJYwXiKtJBtMVME2h7HMQldtdhspHeTEB6n6wKIA0N54wOAN0+I4ZrRM
+      LiabUDwTHFp+nYY/hNSsiv//6bRPotEDewtb0kQ5VsiiN8y2QMBUMFUh8mgDM2iB
+      HrI/XfoBAoGBAPKAF/CK9p7PK+DD0ScKjw00g9g3j6Tq8o5Lx/NQdz1rwFlFSpCZ
+      I01EusyvBL2PtjfqMDGhZWC83xfozJ9/68DjRGJLp6WPUkbpkiRQ8nDJ4UUW/cFt
+      GfhRFcvfy22ssCsUoW2HxpUP4KS4Nr/kMEXOZsvi0ZtHYU048llBoLWFAoGBAMIN
+      qQyZkTG92cAuNAtVyhVSVvgWJZBxwOyNtCrVyNukMk10xsa9+IDoqpZ1J7+KrFNW
+      SeraDPn5V6f8l0uLmVc2NVIIcO8MNUTKS4uVrz04r09I+xCYSfr50fYkCIHyeLVy
+      2p4ayxOWtspt8PL1GfkfEXo0hRznKvOFiLFBDH31AoGAfbMeNaairbEvymNWYAle
+      G3c0PHiYceEDd/UaISp9lI3s95kuTIPEw8GznnO+XlBHIPa4opFJjnp4ndkjcC4L
+      00E66kTTEsOW34ElKsP217YdmgWP5ZqbEpddV/+aYDBaZQpdnvv5WL0RMfD3GEK9
+      LwINUPQyuG2opzG0lcWp+00CgYEAqnCJHHH9Xy0bBnsOZy5Qsm2ByaDaGYZwJtVH
+      e6AOLSyIqhN5S7IrhD3XJxN7d/b66K+PeOFQKHbikL+Au2+/nSQVrRmQ58VXPDZa
+      KB2urx0MjZzSN38q629lBMYdWtV3RBe/AMMTvv7PSflKenrg9zhch3N9vycjSITu
+      zJEPwckCgYEAwPu6H+zSuzN7Trpz4yfSuktjy/wr/+XGf6tNy7XkdKvRrr43E0RR
+      l7bsB5mhmO1jya+0MqMD+ZV3IhNpuFB/V/UzhJQK5958sI76EzfF/vJTNClPS3hC
+      McZTAGj4SfLEhoDNQnv3vayvdXwRZuAVujnJzb+OzD8s16sLHlsGpYg=
       -----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/elephant.yaml b/hiera/elephant.yaml
index 24f9e5d..02b8fbd 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -143,9 +143,9 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - elephant.dev.bitmask.net
-    - dev.bitmask.net
     - api.dev.bitmask.net
+    - dev.bitmask.net
+    - elephant.dev.bitmask.net
     - nicknym.dev.bitmask.net
   public: true
 domain: 
@@ -280,13 +280,13 @@ tags:
   - sandbox-braintree
 webapp: 
   admins: 
+    - azul
     - elijah
-    - varac
-    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - azul
+    - micah
+    - varac
   allow_anonymous_certs: false
   allow_limited_certs: false
   allow_registration: true
@@ -320,9 +320,9 @@ webapp:
     revision: origin/develop
     source: "https://leap.se/git/leap_web"
   modules: 
-    - user
     - billing
     - help
+    - user
   nagios_test_user: 
     password: zvzLB64_Z_5ZL5xvI5MfpUCP3b7gKzhP
     username: nagios_test
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 5b6d538..6f13709 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -67,8 +67,8 @@ stunnel:
   clients: {}
   servers: {}
 tags: 
-  - development
   - dc
+  - development
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index c26d2c4..98348bd 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -47,38 +47,38 @@ location:
 mail: 
   smarthost: []
 mynetworks: 
-  - "176.53.69.22"
-  - "199.119.112.8"
-  - "192.168.5.8"
   - "176.53.69.127"
-  - "198.252.153.83"
-  - "204.13.164.57"
-  - "199.119.112.23"
-  - "192.168.5.23"
-  - "85.17.92.143"
-  - "198.252.153.82"
-  - "199.119.112.16"
-  - "192.168.5.16"
-  - "199.119.112.10"
-  - "192.168.5.10"
-  - "198.252.153.85"
-  - "202.85.227.195"
-  - "199.119.112.9"
-  - "192.168.5.9"
   - "176.53.69.13"
-  - "176.53.69.23"
-  - "176.53.69.21"
   - "176.53.69.14"
-  - "204.13.164.171"
-  - "199.119.112.5"
-  - "192.168.5.5"
-  - "199.119.112.12"
+  - "176.53.69.21"
+  - "176.53.69.22"
+  - "176.53.69.23"
+  - "192.168.5.10"
   - "192.168.5.12"
-  - "199.119.112.4"
+  - "192.168.5.16"
+  - "192.168.5.19"
+  - "192.168.5.23"
   - "192.168.5.4"
+  - "192.168.5.5"
+  - "192.168.5.8"
+  - "192.168.5.9"
+  - "198.252.153.82"
+  - "198.252.153.83"
+  - "198.252.153.85"
+  - "199.119.112.10"
+  - "199.119.112.12"
+  - "199.119.112.16"
   - "199.119.112.19"
-  - "192.168.5.19"
+  - "199.119.112.23"
+  - "199.119.112.4"
+  - "199.119.112.5"
+  - "199.119.112.8"
+  - "199.119.112.9"
+  - "202.85.227.195"
   - "204.13.164.162"
+  - "204.13.164.171"
+  - "204.13.164.57"
+  - "85.17.92.143"
 name: octopus
 service_type: user_service
 services: 
@@ -129,8 +129,8 @@ stunnel:
         original_port: 5984
   servers: {}
 tags: 
-  - unstable
   - dc
+  - unstable
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -350,62 +350,58 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFHDCCAwSgAwIBAgIDDsnRMA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
-      b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-      Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-      dEBjYWNlcnQub3JnMB4XDTE0MDQwODE2NTc1NVoXDTE0MTAwNTE2NTc1NVowHzEd
-      MBsGA1UEAxMUdW5zdGFibGUuYml0bWFzay5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-      A4IBDwAwggEKAoIBAQDnHiuopoBHKl9dEorwQGx6/UqRHoeBqn79mUuAM35gLGvG
-      d0XvBzsFVHOz4pnkqAHavWAwuybiy2RKNd+sBBJTG0u7gzrOnmQkPHSQGg0gTZGq
-      i+RAxJPzcTbyGhXzTQerHRSOFV2+nOkyiqqFjchDjSA8WrDH/XMx+mtZK6/lhhjF
-      c6j083+vE8XKrA+b2oXvpp2E2n/wG1pEW8E6dRk60vdbR879ERE0G2jVsxWepa9k
-      HJ2HtgW7eoorVFhnDClTRVqvrowTZ/UZaZqkO9baWVVwR0KFgEHOzJNAxVAgtuqV
-      3tqhfsmAfV2vcXn5wXFePAWm+l6bN4Jn6HjIggcdAgMBAAGjggEFMIIBATAMBgNV
-      HRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYI
-      KwYBBQUHAwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUw
-      IwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgw
-      JqAkoCKGIGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMEMGA1UdEQQ8
-      MDqCFHVuc3RhYmxlLmJpdG1hc2submV0oCIGCCsGAQUFBwgFoBYMFHVuc3RhYmxl
-      LmJpdG1hc2submV0MA0GCSqGSIb3DQEBDQUAA4ICAQCPEsr+VXzaabzjlGsoyVif
-      SWIXeIAican1kSl7zNanMg60RogEw7D9B7t+YmAAXL3hwPYJyACp3vWFupbYiRYx
-      n6YqMEaxDmrHp1oiXrPrFcQ/SaGhD+KdPV7NjYQEQchHeEj4NGhl9f8UoNxB/ixx
-      uzj6ocN3SmVifw5EDMtvlJmV6sjjro+vz9UzJn8p4KyPLow7j/Ik2UxzXOj10t+b
-      EHtQoUS7HMFD9jWbdzAjAC5/5gbHu8csMAW0yexdgSPik7HA6rlgzcYZ9pYM9e7R
-      mLhbYHaOln50ixGRK7InVY/n/XKLA26TOzwewwsQdu25UtBWxlTSVPPrvRrBMku5
-      lpX1v3IzwR0E9I33Lgu5LRiFX7IldKDibu/r4uvZsCxGr0PPl3PQookrD7+siLHa
-      SnVSVAhi947uu/K45GXDyGfPs0HRYIWpCclnSrq33muSgQQlgNTQ+/h1WrCPW1L7
-      8Llrjiqv8gPcTvREJa5cFBUOC7lmEX5P9LBpOdy7N47Bd9TXIZAKTvFaBbmcaLoz
-      7CnsbC0clW8gCGiP+Q1bTYdjoHD0XjPcmRNMucmfFy+/oUCin4vKLYfDR7X1TO/E
-      PBq3v+dUudr+DDPc3JAShVbgVWCvfZm68DQ0Jly6z++HJ3S2c/yYALsdYwkID2LL
-      mxZwnhZYUW01D1peAX5BNA==
+      MIIEdDCCAlygAwIBAgIQWW5S+JG3Fr6DInjm7VQ7UjANBgkqhkiG9w0BAQsFADBK
+      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
+      MDAyMDAwMDAwWjAxMRAwDgYDVQQKDAdCaXRtYXNrMR0wGwYDVQQDDBR1bnN0YWJs
+      ZS5iaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfS
+      Asf/zPXdD+M2Zp1Pcps3DdyElsAvK2IqaStVKVx9oEETTlDUciUkhtO2CmKsszEn
+      SkvYKM6QsiffarwSe7QIBZBQxXYjGqP9IPhpTt9JPuabJGeZIIu6Pc/odbR9kHYA
+      qIoSGb97JlPsd1Q38q+9WRZdGINIgpHwWmsEe/3fXdy6F2WSdsYI+LLlRmNpi9FU
+      l7sUuXgjyjEvmqzRR001/xglV/8xRDkWZ0R/phQk3KMMexB1STjC9ZyT3+N7SQWP
+      PiC/pus5Aqo5CuknJTNn6bwbPPaCEMqG0U19l33HbZua48QyxYTGz9BSKLt7+77I
+      koJ7H1E5CVOPC46rqUkCAwEAAaNvMG0wHQYDVR0OBBYEFNaC7Y+9eGMFw4b02rfZ
+      DKRoifxAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAJBgNVHRME
+      AjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEB
+      CwUAA4ICAQBSACTOk/lidgImS9KsoRBdmM1kdWhD+FY3RYSpZF8CPr4W1UdPn0GZ
+      C1hGTXZ6fC/muQpZ8IFtNXMnmKnyQ6hw2wBoM/yk8bgyMVOIuRJQ/X4PTdIMrkXT
+      CKsqhzfddob+Gf2XA2/z6MyOKsL2mIJZchAqzZDQDezWzOvb/FP2gUyiiEvBgs2U
+      Re5jgixCKQd8YZ+AZLo6TPM/5JLJoTeRtd2JJyhMuJvLdZGKY8oSlu1TryK9uMB6
+      LxbYsHOjfQd1y3odvq8TPP++AMwAEzYsQm6LNzr6G2DrfFYWmItIbCyE2slAarzu
+      LcaJM8l6tzVYU3qsc+Dwi1a1yIqle3mPmwPf8PYYExIE3aqAD0n9jjJbB8XQ/N2E
+      5Uit63hahzBarvBDxvjh53teElBDvX0G6tgFQHdiZYY+DtMWMpADl5m7kquCfY80
+      HHxBbP7tt55LdZu0N/9CkNdKkeStaDTb4+sSg0A+mXz0IU4zE2aufuWcFsdG/3cQ
+      PuRM7u9dBpD6qPRVw0pw+a6z+6OxaldiuJds+c15taDgab6rLYOPcmxNfFW9qdgA
+      dyRrHeMHcjToYJKQmMtB8VH1HdIUT0WyZlibKj3YBhPIExNLJk83rfF9W72zGUbI
+      0MVbrOyfza0ePv2ngWZlZIhnRBO3iWEn7UNhfBqin8pDuQfDAdgSvg==
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/panda.yaml b/hiera/panda.yaml
index 22f4c58..fd6ec6d 100644
--- a/hiera/panda.yaml
+++ b/hiera/panda.yaml
@@ -136,8 +136,8 @@ stunnel:
       accept_port: 14369
       connect_port: 4369
 tags: 
-  - unstable
   - dc
+  - unstable
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index ef76f27..bc7b855 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -94,8 +94,8 @@ stunnel:
   clients: {}
   servers: {}
 tags: 
-  - unstable
   - dc
+  - unstable
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 34a0801..4f3345c 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -69,38 +69,38 @@ location:
 mail: 
   smarthost: []
 mynetworks: 
-  - "176.53.69.22"
-  - "199.119.112.8"
-  - "192.168.5.8"
   - "176.53.69.127"
-  - "198.252.153.83"
-  - "204.13.164.57"
-  - "199.119.112.23"
-  - "192.168.5.23"
-  - "85.17.92.143"
-  - "198.252.153.82"
-  - "199.119.112.16"
-  - "192.168.5.16"
-  - "199.119.112.10"
-  - "192.168.5.10"
-  - "198.252.153.85"
-  - "202.85.227.195"
-  - "199.119.112.9"
-  - "192.168.5.9"
   - "176.53.69.13"
-  - "176.53.69.23"
-  - "176.53.69.21"
   - "176.53.69.14"
-  - "204.13.164.171"
-  - "199.119.112.5"
-  - "192.168.5.5"
-  - "199.119.112.12"
+  - "176.53.69.21"
+  - "176.53.69.22"
+  - "176.53.69.23"
+  - "192.168.5.10"
   - "192.168.5.12"
-  - "199.119.112.4"
+  - "192.168.5.16"
+  - "192.168.5.19"
+  - "192.168.5.23"
   - "192.168.5.4"
+  - "192.168.5.5"
+  - "192.168.5.8"
+  - "192.168.5.9"
+  - "198.252.153.82"
+  - "198.252.153.83"
+  - "198.252.153.85"
+  - "199.119.112.10"
+  - "199.119.112.12"
+  - "199.119.112.16"
   - "199.119.112.19"
-  - "192.168.5.19"
+  - "199.119.112.23"
+  - "199.119.112.4"
+  - "199.119.112.5"
+  - "199.119.112.8"
+  - "199.119.112.9"
+  - "202.85.227.195"
   - "204.13.164.162"
+  - "204.13.164.171"
+  - "204.13.164.57"
+  - "85.17.92.143"
 name: starfish
 service_type: user_service
 services: