summaryrefslogtreecommitdiff
path: root/tests/puppet
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-08-31 15:42:23 -0700
committerelijah <elijah@riseup.net>2016-08-31 15:42:23 -0700
commit1d8236ec76d0aa0aca0171abd82b1a63450c8321 (patch)
treef3872af684b9ff03f86de6a1cbb12b5022b57e0e /tests/puppet
parent184872506094394ca6f2290f546ab10a9e36b293 (diff)
parente98d216dedbec1dc672ba3d80d5d34f2f4d4e4df (diff)
Merge branch 'cibuild_experimental_09' of https://0xacab.org/varac/platform into develop
Diffstat (limited to 'tests/puppet')
-rw-r--r--tests/puppet/provider/common.json13
-rw-r--r--tests/puppet/provider/nodes/catalogtest.json33
2 files changed, 41 insertions, 5 deletions
diff --git a/tests/puppet/provider/common.json b/tests/puppet/provider/common.json
index c891fea3..a13f8f75 100644
--- a/tests/puppet/provider/common.json
+++ b/tests/puppet/provider/common.json
@@ -1,5 +1,12 @@
-//
-// Options put here are inherited by all nodes.
-//
{
+ "sources": {
+ "platform": {
+ "apt": {
+ "basic": "http://deb.leap.se/experimental-0.9"
+ }
+ },
+ "nickserver": {
+ "revision": "develop"
+ }
+ }
}
diff --git a/tests/puppet/provider/nodes/catalogtest.json b/tests/puppet/provider/nodes/catalogtest.json
index 4f86ac19..05703666 100644
--- a/tests/puppet/provider/nodes/catalogtest.json
+++ b/tests/puppet/provider/nodes/catalogtest.json
@@ -1,10 +1,39 @@
{
"ip_address": "1.1.1.1",
+ "openvpn": {
+ "gateway_address": "1.1.1.2"
+ },
"services": [
"couchdb",
"mx",
"soledad",
- "webapp"
+ "webapp",
+ "monitor",
+ "openvpn",
+ "tor",
+ "obfsproxy",
+ "static"
],
- "tags": ["catalogtest"]
+ "tags": ["catalogtest","development"],
+ "static": {
+ "domains":{
+ "example.org": {
+ "tls_only": true,
+ "locations": {
+ "front": {
+ "path": "/",
+ "format": "amber",
+ "source": {
+ "type": "git",
+ "repo": "https://leap.se/git/bitmask_help",
+ "revision": "origin/master"
+ }
+ }
+ },
+ "cert": "= file('cert/example.org.crt')",
+ "key": "= file('cert/example.org.key')",
+ "ca_cert": "= file('cert/commercial_ca.crt')"
+ }
+ }
+ }
}