From 1e463c6638a05a237d660f458f5a147353be3fc1 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 26 May 2017 16:41:51 -0700
Subject: static - support for renewing certs with let's encrypt for static
 sites

---
 provider_base/common.json          | 3 ++-
 provider_base/services/static.rb   | 2 ++
 provider_base/services/webapp.json | 3 ---
 provider_base/services/webapp.rb   | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 provider_base/services/static.rb
 create mode 100644 provider_base/services/webapp.rb

(limited to 'provider_base')

diff --git a/provider_base/common.json b/provider_base/common.json
index 41e1daa3..97519950 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -12,7 +12,8 @@
      "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)"
   },
   "dns": {
-    "public": "= service_type != 'internal_service'"
+    "public": "= service_type != 'internal_service'",
+    "aliases": []
   },
   "ssh": {
     "authorized_keys": "= authorized_keys",
diff --git a/provider_base/services/static.rb b/provider_base/services/static.rb
new file mode 100644
index 00000000..d020ba26
--- /dev/null
+++ b/provider_base/services/static.rb
@@ -0,0 +1,2 @@
+self['dns']['aliases'] += self.static.domains.keys
+self['dns']['aliases'].uniq!
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 36f161b1..ac58ac12 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -71,9 +71,6 @@
     },
     "port": 6425
   },
-  "dns": {
-    "aliases": "= [domain.full, webapp.domain, api.domain, nickserver.domain]"
-  },
   "x509": {
     "use": true,
     "use_commercial": true,
diff --git a/provider_base/services/webapp.rb b/provider_base/services/webapp.rb
new file mode 100644
index 00000000..a5f10a2d
--- /dev/null
+++ b/provider_base/services/webapp.rb
@@ -0,0 +1,2 @@
+self['dns']['aliases'] += [domain.full, webapp.domain, api.domain, nickserver.domain]
+self['dns']['aliases'].uniq!
-- 
cgit v1.2.3