From ac74640c5f4a65f8f117deeaed8d1cd29a22bc3c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 14 Nov 2012 23:49:56 -0800
Subject: added provider_base (latest leap_cli required)

---
 provider_base/services/ca.json      |  6 ++++++
 provider_base/services/couchdb.json | 22 ++++++++++++++++++++++
 provider_base/services/dns.json     |  7 +++++++
 provider_base/services/openvpn.json | 14 ++++++++++++++
 provider_base/services/webapp.json  | 19 +++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 provider_base/services/ca.json
 create mode 100644 provider_base/services/couchdb.json
 create mode 100644 provider_base/services/dns.json
 create mode 100644 provider_base/services/openvpn.json
 create mode 100644 provider_base/services/webapp.json

(limited to 'provider_base/services')

diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
new file mode 100644
index 00000000..68f970f7
--- /dev/null
+++ b/provider_base/services/ca.json
@@ -0,0 +1,6 @@
+{
+  "service_type": "internal_service",
+  "x509": {
+    "use": true
+  }
+}
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
new file mode 100644
index 00000000..1c8005c2
--- /dev/null
+++ b/provider_base/services/couchdb.json
@@ -0,0 +1,22 @@
+{
+  "service_type": "internal_service",
+  "x509": {
+    "use": true
+  },
+  "couch": {
+    "users": {
+      "admin": {
+        "username": "admin",
+        "password": "= secret :couch_admin_password"
+      },
+      "webapp": {
+        "username": "webapp",
+        "password": "= secret :couch_webapp_password"
+      },
+      "ca_daemon": {
+        "username": "ca_daemon",
+        "password": "= secret :couch_ca_daemon_password"
+      }
+    }
+  }
+}
diff --git a/provider_base/services/dns.json b/provider_base/services/dns.json
new file mode 100644
index 00000000..677d9b2c
--- /dev/null
+++ b/provider_base/services/dns.json
@@ -0,0 +1,7 @@
+{
+  "hosts": {
+    "public":  "= nodes['dns.public' => true].fields('domain.name', 'dns.aliases', 'ip_address')",
+    "private": "= nodes['dns.public' => false].fields('domain.name', 'dns.aliases', 'ip_address')"
+  },
+  "service_type": "public_service"
+}
\ No newline at end of file
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
new file mode 100644
index 00000000..4b7d25ec
--- /dev/null
+++ b/provider_base/services/openvpn.json
@@ -0,0 +1,14 @@
+{
+  "service_type": "user_service",
+  "x509": {
+    "use": true
+  },
+  "openvpn": {
+    "ports": ["80", "443", "53", "1194"],
+    "filter_dns": false,
+    "nat": true,
+    "ca_crt": "= file :ca_cert",
+    "ca_key": "= file :ca_key",
+    "dh": "= file :dh_params"
+  }
+}
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
new file mode 100644
index 00000000..6e5c029c
--- /dev/null
+++ b/provider_base/services/webapp.json
@@ -0,0 +1,19 @@
+{
+  "webapp": {
+    "modules": ["user", "billing", "help"],
+    "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')",
+    "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
+  },
+  "definition_files": {
+    "provider": "= file('service-definitions/provider.json.erb')",
+    "eip_service": "file('service-definitions/eip-service.json.erb')"
+  },
+  "service_type": "public_service",
+  "api_domain": "= 'api.' + domain.full_suffix",
+  "dns": {
+    "aliases": "= [domain.full, api_domain]"
+  },
+  "x509": {
+    "use": true
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 74047765ad815ae72a1e0eb2355e6fbc68d4db57 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 15 Nov 2012 01:18:10 -0800
Subject: added eip-service.json

---
 provider_base/services/openvpn.json | 5 ++++-
 provider_base/services/webapp.json  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 4b7d25ec..46dcd50e 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -4,9 +4,12 @@
     "use": true
   },
   "openvpn": {
+    "location": "Location Unknown",
     "ports": ["80", "443", "53", "1194"],
+    "protocols": ["tcp", "udp"],
     "filter_dns": false,
-    "nat": true,
+    "adblock": false,
+    "user_ips": false,
     "ca_crt": "= file :ca_cert",
     "ca_key": "= file :ca_key",
     "dh": "= file :dh_params"
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 6e5c029c..7e12d26e 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -5,8 +5,8 @@
     "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
   },
   "definition_files": {
-    "provider": "= file('service-definitions/provider.json.erb')",
-    "eip_service": "file('service-definitions/eip-service.json.erb')"
+    "provider": "= file 'service-definitions/provider.json.erb'",
+    "eip_service": "= file 'service-definitions/eip-service.json.erb'"
   },
   "service_type": "public_service",
   "api_domain": "= 'api.' + domain.full_suffix",
-- 
cgit v1.2.3


From 0c65e5c1169fa33d08c3ffa02d5cf3060a009892 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sat, 17 Nov 2012 01:24:00 -0800
Subject: added commercial_cert to webapp

---
 provider_base/services/webapp.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 7e12d26e..ca9edf33 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -14,6 +14,8 @@
     "aliases": "= [domain.full, api_domain]"
   },
   "x509": {
-    "use": true
+    "use": true,
+    "commercial_cert": "= file [:commercial_cert, global.provider.domain]",
+    "commercial_key": "= file [:commercial_key, global.provider.domain]"
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 25bbdd69cd2f2c19e3a183b38388b88db1b412a9 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sat, 17 Nov 2012 01:24:19 -0800
Subject: added better warnings to openvpn service when files are missing

---
 provider_base/services/openvpn.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 46dcd50e..71d1d2c7 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -10,8 +10,8 @@
     "filter_dns": false,
     "adblock": false,
     "user_ips": false,
-    "ca_crt": "= file :ca_cert",
-    "ca_key": "= file :ca_key",
-    "dh": "= file :dh_params"
+    "ca_crt": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
+    "ca_key": "= file :ca_key, :missing => 'Certificate Authority. Run `leap init-ca`'",
+    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
   }
 }
-- 
cgit v1.2.3


From 9491f15a64c13f2424b781d32d5734db3bb4a22f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 21 Nov 2012 13:47:41 -0800
Subject: added x509.commercial_ca_cert. x509.ca_cert is now optional, except
 for webapp.

---
 provider_base/services/webapp.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ca9edf33..bdef5761 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -15,7 +15,9 @@
   },
   "x509": {
     "use": true,
+    "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap init-ca`'",
     "commercial_cert": "= file [:commercial_cert, global.provider.domain]",
-    "commercial_key": "= file [:commercial_key, global.provider.domain]"
+    "commercial_key": "= file [:commercial_key, global.provider.domain]",
+    "commercial_ca_cert": "= try_file :commercial_ca_cert"
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From f3704fc0ac81ca6ccb7e7d19ae931d9c391f3975 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 22 Nov 2012 11:43:23 -0800
Subject: clean up openvpn and x509 paths

---
 provider_base/services/openvpn.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 71d1d2c7..15deab70 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -1,7 +1,9 @@
 {
   "service_type": "user_service",
   "x509": {
-    "use": true
+    "use": true,
+    "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
+    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
   },
   "openvpn": {
     "location": "Location Unknown",
@@ -9,9 +11,6 @@
     "protocols": ["tcp", "udp"],
     "filter_dns": false,
     "adblock": false,
-    "user_ips": false,
-    "ca_crt": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
-    "ca_key": "= file :ca_key, :missing => 'Certificate Authority. Run `leap init-ca`'",
-    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
+    "user_ips": false
   }
 }
-- 
cgit v1.2.3


From 3e53ba65fbf1eb48dbe01526342e601a1c10c824 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 23 Nov 2012 01:54:40 -0800
Subject: get rid of paths in webapp.json, use symbolic filenames instead.

---
 provider_base/services/webapp.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index bdef5761..321c26ea 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -5,8 +5,8 @@
     "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
   },
   "definition_files": {
-    "provider": "= file 'service-definitions/provider.json.erb'",
-    "eip_service": "= file 'service-definitions/eip-service.json.erb'"
+    "provider": "= file :provider_json_template",
+    "eip_service": "= file :eip_service_json_template"
   },
   "service_type": "public_service",
   "api_domain": "= 'api.' + domain.full_suffix",
-- 
cgit v1.2.3


From 05d3c0903f48e9c0d69145c9e027b70a392c9602 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 27 Nov 2012 12:27:35 -0800
Subject: fix webapp: only list couchdb hosts that match node's 'local' value.

---
 provider_base/services/webapp.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 321c26ea..afb51ee1 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -1,7 +1,7 @@
 {
   "webapp": {
     "modules": ["user", "billing", "help"],
-    "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')",
+    "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
     "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
   },
   "definition_files": {
-- 
cgit v1.2.3


From bef21f7f132438777b2ab92525559ba8ed869fb9 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 28 Nov 2012 14:09:23 -0800
Subject: updated service templates to reflect new command names

---
 provider_base/services/openvpn.json | 4 ++--
 provider_base/services/webapp.json  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 15deab70..0008a2d2 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -2,8 +2,8 @@
   "service_type": "user_service",
   "x509": {
     "use": true,
-    "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
-    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
+    "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
+    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap cert dh`'"
   },
   "openvpn": {
     "location": "Location Unknown",
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index afb51ee1..b04ed684 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -15,7 +15,7 @@
   },
   "x509": {
     "use": true,
-    "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap init-ca`'",
+    "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",
     "commercial_cert": "= file [:commercial_cert, global.provider.domain]",
     "commercial_key": "= file [:commercial_key, global.provider.domain]",
     "commercial_ca_cert": "= try_file :commercial_ca_cert"
-- 
cgit v1.2.3


From 450c3ba29c0e8d3a3c8cf1946aa71160b3c48897 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 7 Dec 2012 14:17:52 +0100
Subject: added couchdb hiera variables to services/ca.json

---
 provider_base/services/ca.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'provider_base/services')

diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index 68f970f7..f3758ab6 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,4 +1,8 @@
 {
+  "ca": {
+    "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
+    "couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
+  },
   "service_type": "internal_service",
   "x509": {
     "use": true
-- 
cgit v1.2.3


From 51f37d8132a44e25350db66b7156892980d3e4fa Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 7 Dec 2012 14:48:55 +0100
Subject: ca -> ca_daemon in site.pp and services/ca.json

---
 provider_base/services/ca.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index f3758ab6..800c995d 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,5 +1,5 @@
 {
-  "ca": {
+  "ca_daemon": {
     "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
     "couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
   },
-- 
cgit v1.2.3


From 6af460dd3b2e686734df876eff9b621f2162da69 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 7 Dec 2012 15:52:50 -0800
Subject: added hostname tracking and late evaluation. new key "hosts" added,
 for building /etc/hosts. also, now ssh.known_hosts only includes what is
 necessary.

---
 provider_base/services/ca.json     | 2 +-
 provider_base/services/webapp.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index 800c995d..a4ded72b 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,6 +1,6 @@
 {
   "ca_daemon": {
-    "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
+    "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
     "couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
   },
   "service_type": "internal_service",
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index b04ed684..3eb0ba62 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -1,7 +1,7 @@
 {
   "webapp": {
     "modules": ["user", "billing", "help"],
-    "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
+    "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
     "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
   },
   "definition_files": {
-- 
cgit v1.2.3


From cded90f839871cf6258d7dc28d3ce81cf7f9cf6c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 18 Dec 2012 10:26:57 -0800
Subject: ca daemon -- ca daemon needs the x509 cert/key for the CA, not for
 the server.

---
 provider_base/services/ca.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index a4ded72b..3fb8bf6c 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -5,6 +5,7 @@
   },
   "service_type": "internal_service",
   "x509": {
-    "use": true
+    "use": true,
+    "ca_key": "= file(:ca_key, :missing => 'CA key. Run `leap cert ca` to create the Certificate Authority.')"
   }
 }
-- 
cgit v1.2.3


From c3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 19 Dec 2012 12:12:16 -0800
Subject: webapp api now uses a customizable port (so that we don't try to rely
 on SNI for hosting two TLS domains on one IP).

---
 provider_base/services/webapp.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 3eb0ba62..e40ed0ca 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -9,9 +9,12 @@
     "eip_service": "= file :eip_service_json_template"
   },
   "service_type": "public_service",
-  "api_domain": "= 'api.' + domain.full_suffix",
+  "api": {
+    "domain": "= 'api.' + domain.full_suffix",
+    "port": "4430"
+  },
   "dns": {
-    "aliases": "= [domain.full, api_domain]"
+    "aliases": "= [domain.full, api.domain]"
   },
   "x509": {
     "use": true,
-- 
cgit v1.2.3


From ec6c48ab589d4174dc192a01c4b99833227c5942 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 13 Jan 2013 20:30:24 -0800
Subject: added ability to customize the webapp appearance

---
 provider_base/services/webapp.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index e40ed0ca..311f1284 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -2,7 +2,11 @@
   "webapp": {
     "modules": ["user", "billing", "help"],
     "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
-    "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
+    "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]",
+    "favicon": "= file_path 'branding/favicon.ico'",
+    "tail_scss": "= file_path 'branding/tail.scss'",
+    "head_scss": "= file_path 'branding/head.scss'",
+    "img_dir": "= file_path 'branding/img'"
   },
   "definition_files": {
     "provider": "= file :provider_json_template",
-- 
cgit v1.2.3


From 306a0e6c21d0e27035ba48530392eede59537516 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 21 Jan 2013 22:41:51 -0800
Subject: client ca -- configure the webapp with the client ca

---
 provider_base/services/openvpn.json | 2 +-
 provider_base/services/webapp.json  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 0008a2d2..7b67ccb3 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -2,7 +2,7 @@
   "service_type": "user_service",
   "x509": {
     "use": true,
-    "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
+    "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
     "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap cert dh`'"
   },
   "openvpn": {
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 311f1284..c9e4c532 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -23,6 +23,8 @@
   "x509": {
     "use": true,
     "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",
+    "client_ca_cert": "= file_path :client_ca_cert",
+    "client_ca_key": "= file_path :client_ca_key",
     "commercial_cert": "= file [:commercial_cert, global.provider.domain]",
     "commercial_key": "= file [:commercial_key, global.provider.domain]",
     "commercial_ca_cert": "= try_file :commercial_ca_cert"
-- 
cgit v1.2.3


From a5708f899f8330e79ebf9c1d69377b89f1919b1b Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 28 Jan 2013 03:04:21 -0800
Subject: added 'monitor' service to provider_base

---
 provider_base/services/monitor.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 provider_base/services/monitor.json

(limited to 'provider_base/services')

diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
new file mode 100644
index 00000000..0a44ded1
--- /dev/null
+++ b/provider_base/services/monitor.json
@@ -0,0 +1,6 @@
+{
+  "nagios": {
+    "nagiosadmin_pw": "= secret :nagios_admin_password",
+    "hosts": "= nodes['production' => true].fields('domain.full', 'ip_address', 'services')"
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 349c58f668e419595ff3aff902948e7901e88d55 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 28 Jan 2013 21:45:09 +0100
Subject: update services/monitoring.json to include openvpn_gateway_address

---
 provider_base/services/monitor.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index 0a44ded1..09972308 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,6 +1,6 @@
 {
   "nagios": {
     "nagiosadmin_pw": "= secret :nagios_admin_password",
-    "hosts": "= nodes['production' => true].fields('domain.full', 'ip_address', 'services')"
+    "hosts": "= nodes['production' => true].fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')" 
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 370476dc632aa8ec87fb4c9c0fa36b030186ebd8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 6 Feb 2013 23:57:38 +0100
Subject: tor service defaults

---
 provider_base/services/tor.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 provider_base/services/tor.json

(limited to 'provider_base/services')

diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json
new file mode 100644
index 00000000..10806084
--- /dev/null
+++ b/provider_base/services/tor.json
@@ -0,0 +1,5 @@
+{
+    "tor" : {
+        "bandwidth_rate" : 6550
+    }
+}
-- 
cgit v1.2.3


From 49fc7e085f635c906b32adfc41a207939be2cf39 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 8 Feb 2013 19:40:56 -0800
Subject: make monitor service include the nodes that are of a similar type
 (e.g. production or local).

---
 provider_base/services/monitor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index 09972308..f5e4d922 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,6 +1,6 @@
 {
   "nagios": {
     "nagiosadmin_pw": "= secret :nagios_admin_password",
-    "hosts": "= nodes['production' => true].fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')" 
+    "hosts": "= nodes_like_me.fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
   }
 }
-- 
cgit v1.2.3


From 6e3d87d88578447aa4358aabdf270df2082b422d Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 8 Feb 2013 23:11:15 -0800
Subject: changed contact_email to tor.contacts

---
 provider_base/services/tor.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json
index 10806084..9173b8d4 100644
--- a/provider_base/services/tor.json
+++ b/provider_base/services/tor.json
@@ -1,5 +1,6 @@
 {
-    "tor" : {
-        "bandwidth_rate" : 6550
-    }
+  "tor": {
+    "bandwidth_rate": 6550,
+    "contacts": "= global.provider.contacts['tor'] || global.provider.contacts.default"
+  }
 }
-- 
cgit v1.2.3


From ba2b83b19f951322e85f64bf010764a49ee9f2f4 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 12 Feb 2013 10:54:04 -0800
Subject: temporarily make the webapp use the admin couchdb user. waiting on
 https://leap.se/code/issues/1163

---
 provider_base/services/webapp.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index c9e4c532..e3055c6f 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -2,7 +2,9 @@
   "webapp": {
     "modules": ["user", "billing", "help"],
     "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
-    "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]",
+    # NOTE: this is bad, but pending a fix to https://leap.se/code/issues/1163
+    # before we can use user "webapp"
+    "couchdb_user": "= global.services[:couchdb].couch.users[:admin]",
     "favicon": "= file_path 'branding/favicon.ico'",
     "tail_scss": "= file_path 'branding/tail.scss'",
     "head_scss": "= file_path 'branding/head.scss'",
-- 
cgit v1.2.3