From 2fcbbaafa8348220c178ddaa43cde6ae198e483e Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 6 Nov 2012 23:42:08 -0800
Subject: name change from rewire to bitmask

---
 provider/common.json                       |  4 +-
 provider/files/ca/ca.crt                   | 60 +++++++++---------
 provider/files/ca/ca.key                   | 98 +++++++++++++++---------------
 provider/files/nodes/couch1/couch1_ssh.pub |  1 +
 provider/files/ssh/known_hosts             |  6 +-
 provider/provider.json                     |  7 ++-
 6 files changed, 90 insertions(+), 86 deletions(-)
 create mode 100644 provider/files/nodes/couch1/couch1_ssh.pub

diff --git a/provider/common.json b/provider/common.json
index 0d74df5..7504e86 100644
--- a/provider/common.json
+++ b/provider/common.json
@@ -3,8 +3,8 @@
 #
 {
   "domain": {
-     "full_suffix": "rewire.co",
-     "internal_suffix": "rewire",
+     "full_suffix": "= global.provider.domain",
+     "internal_suffix": "= global.provider.internal_domain",
      "full": "= node.name + '.' + domain.full_suffix",
      "internal": "= node.name + '.' + domain.internal_suffix",
      "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)"
diff --git a/provider/files/ca/ca.crt b/provider/files/ca/ca.crt
index f0da5b7..80d41c3 100644
--- a/provider/files/ca/ca.crt
+++ b/provider/files/ca/ca.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBSMRcwFQYDVQQDDA5SZXdp
-cmUgUm9vdCBDQTEbMBkGA1UECgwSVGhlIFJld2lyZSBDb21wYW55MRowGAYDVQQL
-DBFodHRwczovL3Jld2lyZS5jbzAeFw0xMjExMDEwMDAwMDBaFw0xNDExMDEwMDAw
-MDBaMFIxFzAVBgNVBAMMDlJld2lyZSBSb290IENBMRswGQYDVQQKDBJUaGUgUmV3
-aXJlIENvbXBhbnkxGjAYBgNVBAsMEWh0dHBzOi8vcmV3aXJlLmNvMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8temmaT2q6lYm6UzACBgnHFw3+ogfqnS
-S9QSi6pDnSCYnWLAkKvR7RC9FBWsd5skFzrjuEt49ylinVp8qhnKh3Usyhn2kLmg
-bLp9BnPPTvKOHY/y56BLomAfYZz20CS1GLI08/X5sofe/StsXmMAqI1ewnCKdIqq
-WBROmLHGjX6Ipux+ECuORIND/KeUCkUJKVA5UfdSvisS0Pp6Y1P+hpDzNbRBOs+w
-MtqOo8h3D46AD9nhTODlESuK5v39++2wsLpcg1GST8+VMmYk1paEe+S5G/kq22gX
-W1V/HSPFHe/gBNfORLt76eF42ziVXpfbsDNO6ktNTYveBVlhQMVev9CvEXjXmOD7
-S291iMA41LtaCLvTNmFZGc0K0w2dC8cGUhp3pN6fXi0j+BbpUdEVqGlrdcN4KEmd
-IhtX6FlgRTVg/gCmLHf7V6FQ5J2E2FyWpRIzvL02UywOU+0PtKH1uFxpn9ZbH7f8
-nvB0ZiC1NiUFlHTioYJ9Vl7WuBICzSpKiHdaHs4ZdlWTARkjzRaW4OCq6rj8CqqC
-XN2ELuWSu2bcBKoqdqtSBHvpFLoO5SwPFtnMDDTftMsOEdiJj2SOYD3cLflAW2lh
-C3LLjfXPXMS71P5E1BiEb8+n6BMq5yItsqLU33gnzNs6qT13Zs0Q0NL5kNhy9Ijq
-kZJA6WHzx6ECAwEAAaNgMF4wHQYDVR0OBBYEFJ46FIqdGpfF2ICpFWHOQV2Cpwpz
-MA4GA1UdDwEB/wQEAwICBDAMBgNVHRMEBTADAQH/MB8GA1UdIwQYMBaAFJ46FIqd
-GpfF2ICpFWHOQV2CpwpzMA0GCSqGSIb3DQEBDQUAA4ICAQAApGmMcA5nYaSkYHXA
-OQ1J/bNKyxyE8MQ0o8QcJyfGT8Bu4fLSxHmG1cLAiCWUVlxsLpWruHvvSq4aQGa6
-A4C6yaKF5ZBK0DJOMnNlCtXv0wkvxP7PwD91mbLd8C80+FXdGroTpFJWAu1JDk7C
-hD0JR44nVz+WWUxJhInN67Q20LuYq0foB73mMMBNkA6ArwGMmTRiu8PL+H6n52hy
-ueI+EL2rY2tuCAyRBCpFZ1u9Iyv3toJeN6UgkXrSDnm5sd/B3ts2m5f5iQ1uFzV7
-fiMDuFJZM/LMtWXkBY4PnrqArpKJexSj4F7wjwfawagIUKs+NXh56nESn8LhJwSv
-OpxBNBYWrJ2DRNrhSDIEKHy82FabJuOnu9vaqWTWnINp4qIy2Hvf7QpcsYmJIiHh
-C12VoSrZmJaZ8rOPujusg2SMNlKICIxvrWPCGrazMAT/c4slADGXNBE1ou+R8ngl
-ZQMGYoB1tkd4cmPpv/Ys/sXpeuYl8N67LjwEyTGSiQYH0++KPek3sfykw3y+clml
-XwJhw0NXTntNoHtM4NGYwhqwbmpTyynOiMIgEBzgrGYVkt6WS8hu0406eEaHki0V
-MePTTq5Dn64audStgRO2NchPh1YNmatZc2r/d/oYUwTvZDSXyuWf5YSybZGQakOC
-fGjwgKHysatH8bF9bxwKFCkj9A==
+MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
+YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
+Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
+FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
+BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
+dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
+7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
+CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
+znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
+MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
+lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
+bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
+DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
+lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
+YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
+XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
+MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
+DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
+cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
+k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
+RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
+htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
+EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
+aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
+mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
+G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
+Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
+69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
+yV8e
 -----END CERTIFICATE-----
diff --git a/provider/files/ca/ca.key b/provider/files/ca/ca.key
index 64511de..ba6ac3f 100644
--- a/provider/files/ca/ca.key
+++ b/provider/files/ca/ca.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIJKwIBAAKCAgEA8temmaT2q6lYm6UzACBgnHFw3+ogfqnSS9QSi6pDnSCYnWLA
-kKvR7RC9FBWsd5skFzrjuEt49ylinVp8qhnKh3Usyhn2kLmgbLp9BnPPTvKOHY/y
-56BLomAfYZz20CS1GLI08/X5sofe/StsXmMAqI1ewnCKdIqqWBROmLHGjX6Ipux+
-ECuORIND/KeUCkUJKVA5UfdSvisS0Pp6Y1P+hpDzNbRBOs+wMtqOo8h3D46AD9nh
-TODlESuK5v39++2wsLpcg1GST8+VMmYk1paEe+S5G/kq22gXW1V/HSPFHe/gBNfO
-RLt76eF42ziVXpfbsDNO6ktNTYveBVlhQMVev9CvEXjXmOD7S291iMA41LtaCLvT
-NmFZGc0K0w2dC8cGUhp3pN6fXi0j+BbpUdEVqGlrdcN4KEmdIhtX6FlgRTVg/gCm
-LHf7V6FQ5J2E2FyWpRIzvL02UywOU+0PtKH1uFxpn9ZbH7f8nvB0ZiC1NiUFlHTi
-oYJ9Vl7WuBICzSpKiHdaHs4ZdlWTARkjzRaW4OCq6rj8CqqCXN2ELuWSu2bcBKoq
-dqtSBHvpFLoO5SwPFtnMDDTftMsOEdiJj2SOYD3cLflAW2lhC3LLjfXPXMS71P5E
-1BiEb8+n6BMq5yItsqLU33gnzNs6qT13Zs0Q0NL5kNhy9IjqkZJA6WHzx6ECAwEA
-AQKCAgEAm4+le3r/QQvkZSA4QXZ8LPtGcUnLsxgaTNT3ZFyXn4oH+ZoO/R30BkbY
-uIsBxkSto+vngGFohfwO3fnfLiADay6WmIh1OFSQ/dWgzYdWX55lh251DgfTK5sj
-vyYLvV4mXEGcRkNlxwXexJMSgowtGcwlzazGJM3HPVEU4B/Rr0ZFR5jrUHR2WFE2
-Nh0rakC7E6n+bhFfAc8Z6KDr0cE2pQEpq1djCceNeaYkBasfCeohAwZxmwvd8VfR
-TRObpcyniS54oO6aKWIykux34Lbe+3aTVeYRnCdb/vgPy5zkYr8M5E1SJxlq0XHM
-N7JRjRz+cCsN/GxsgqZ8fTS6ZgGJJVuZWwZUe/yvvI1FcROI6GGA6AhFHXtJ6Udf
-8lcluhp6oMFxV4Z2wot5eP/jd9LmvuSWE2QLLUXEg8KF0kkZgI+DQB5PvRUPR6YB
-VuPLO3CLlCQmWUduBT2JhJN9WpSfANFZfvuDduxz7ExqM0iEUJTnr8y1CU7Eld35
-vdeXy8Qf6tLTNs8m8fMgwpX+9WoZUYxYpJ35lU02nV6coVlSce0oF63+c1Gjf1yL
-aa3lpOEzs4aZ1UAhkfO/9Ksq6Pg4Dzb5aGrPD6VvF/n5sn//ZdGqp5qLSOILnejj
-sP4jeWBXo696VTuCi4rmvy06UFuYpL6UpTDzhdheenFW4GMJxvkCggEBAPl+sYLV
-4fOZU9CYOrdenSi1BqlFSWkziUh3nNaI5hWmsSHxpL2XDMejhSwf9Mzg0sB9vWoB
-PPdPgMxLMAp6cbp+7rPIJgMrgfEQSlF4HMogQvq+wTGhIck8N/nIM+9cNdvBOnXm
-+yUFZYFfHu+QSiBayuRYKxguATK6sq6XmNkvcnrt1dsPR73bFIx0pdt1ZzMgLTaU
-uSRPayGnyMUiXXM/nfncz93dpvd+KKo79cKZcW/KWCwToYJIRXub/KdznN/nNyaT
-fkCCR1aUz6nfXchmWJ10E6fVjBoHfy3gInR5ixd2Y+XQXWBbnM+zCL+Z1+dUFN6Z
-2V0wHDOHLButhWcCggEBAPksjcUa3DPQhqVHihrK2dvJWqem7al52Hb1CQX9lvo9
-CMSbEZtOC/1D1VchXonkZ7tc0rdCGpL3VhEyFSkhA4+9JUeTQc7TfTaIgM0Xe1a1
-oDr65RgkfQOnLftK1OvcazgErcnoPkh7PP41duKOvMO/bi4H9Mzv6/4+af6o+sDq
-/hDTf9ope02c78n7id0GNTaYmdVL60uDh6kK/7tcuWv7f4TDjTcmVMKvJ9yOru2Y
-sTF7xV1bb3Br45bGWdneMMfS8R0xtXvn/VaPYPoa3XQFCQYfbgBVUxPaYGuys/i2
-mwsImKKNDbXcMbxPfH5dz38VgNHzmkAttxHDOrIVXbcCggEBAIuXs0H84VsmYprH
-UbLfIRdxkbSLq7NMvnbpVbtDBVj/1wOi7AWXyfK5Lv2tM46eC8zfjWcOIkpNFUc4
-mjyCnbc25d95EKudYCq8bph+l70Pp+obaISYHws0wizjMwutkATQbCEjh0kDZ/Om
-gOyQ0qifo/12x0XUF5+GjgrZjw+VWHwnLgxO1FkJhsm/Sj0rxv339tQfCieit9Iw
-ykhiHd8prP3r6fG83nqC/8WfnrWunKVrlUG0Ch2WyimK8SXPreoot9bBl1YIjlmH
-EVl+PD6v5MzT8VtqQ+UcZLAKQ7zfdE9AUkx29IfBOk+LYE2zifVIOhUCB3f4Pw8l
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/couch1/couch1_ssh.pub b/provider/files/nodes/couch1/couch1_ssh.pub
new file mode 100644
index 0000000..7d16c09
--- /dev/null
+++ b/provider/files/nodes/couch1/couch1_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
\ No newline at end of file
diff --git a/provider/files/ssh/known_hosts b/provider/files/ssh/known_hosts
index 6fe286c..c843fc3 100644
--- a/provider/files/ssh/known_hosts
+++ b/provider/files/ssh/known_hosts
@@ -1,3 +1,3 @@
-couch1,couch1.rewire,couch1.rewire.co,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
-vpn1,vpn1.rewire,vpn1.rewire.co,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
-web1,web1.rewire,web1.rewire.co,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsxN2K/I/pVbcU4nNsep9BsUzebFpldzntm6KBx+6OGgLEJnK0WObk0mqP29W2HveisF61hgpI+j7BX38VTiRIcPJEK1BoPONcrVX/bWARn+88PhFfoMJLa5rON5IFAahRUOkS4CnrAwsuvOZ4CzneW1P7cYitKrRNUXzKMHRcAd5alOyrSKLJ29JmIt7ojmYTnNYQYsvyqexI6pyfg4kIYFHzt0BIzNWMJb76PrTpteY4ZW35VHdB8AGLSI7iWxMtEyekhlvHJ2EoHfvps+BVTto7xxVFLDpjIdzxClGcQNvWB14NdYQ0ikRflYRMO6nvTGC31jij43oMp2cACUwD
+couch1,couch1.bitmask.i,couch1.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+vpn1,vpn1.bitmask.i,vpn1.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+web1,web1.bitmask.i,web1.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsxN2K/I/pVbcU4nNsep9BsUzebFpldzntm6KBx+6OGgLEJnK0WObk0mqP29W2HveisF61hgpI+j7BX38VTiRIcPJEK1BoPONcrVX/bWARn+88PhFfoMJLa5rON5IFAahRUOkS4CnrAwsuvOZ4CzneW1P7cYitKrRNUXzKMHRcAd5alOyrSKLJ29JmIt7ojmYTnNYQYsvyqexI6pyfg4kIYFHzt0BIzNWMJb76PrTpteY4ZW35VHdB8AGLSI7iWxMtEyekhlvHJ2EoHfvps+BVTto7xxVFLDpjIdzxClGcQNvWB14NdYQ0ikRflYRMO6nvTGC31jij43oMp2cACUwD
diff --git a/provider/provider.json b/provider/provider.json
index d4153a6..e65eebe 100644
--- a/provider/provider.json
+++ b/provider/provider.json
@@ -2,8 +2,10 @@
 # General service provider configuration.
 #
 {
+  "domain": "bitmask.net",
+  "internal_domain": "= domain.sub(/\\..*$/,'.i')",
   "name": {
-    "en": "The Rewire Company"
+    "en": "Bitmask"
   },
   "description": {
     "en": "A demonstration service provider using the LEAP platform"
@@ -12,10 +14,11 @@
   "default_language": "en",
   "enrollment_policy": "open",
   "ca": {
-    "name": "Rewire Root CA",
+    "name": "= global.provider.ca.organization + ' Root CA'",
     "organization": "= global.provider.name[global.provider.default_language]",
     "organizational_unit": "= 'https://' + global.common.domain.full_suffix",
     "bit_size": 4096,
+    "life_span": "10y",
     "server_certificates": {
       "bit_size": 3248,
       "life_span": "1y"
-- 
cgit v1.2.3