diff options
| author | elijah <elijah@riseup.net> | 2013-01-31 11:14:06 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-01-31 11:14:06 -0800 |
| commit | b4204fc28a8ced9fd0b3dde02d8de8beacb0e42f (patch) | |
| tree | 8463cf990cdad303bf276a81f09c7be755cdc0e0 | |
| parent | 0405bd0e39743525c06e7541946ed87e9be92e92 (diff) | |
| parent | bd71dcf396ff914bb4b994cabd9b6cc0beae4050 (diff) | |
Merge branch 'master' of ssh://leap.se/bitmask
Conflicts:
provider/secrets.json
| -rw-r--r-- | provider/.gitignore | 1 | ||||
| -rw-r--r-- | provider/Leapfile | 1 | ||||
| -rw-r--r-- | provider/nodes/turtle.json | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/provider/.gitignore b/provider/.gitignore index c255c3b..79b87ad 100644 --- a/provider/.gitignore +++ b/provider/.gitignore @@ -3,3 +3,4 @@ test/.vagrant test/openvpn test/cert hiera/*.yaml +/Leapfile diff --git a/provider/Leapfile b/provider/Leapfile deleted file mode 100644 index 4ebb9cb..0000000 --- a/provider/Leapfile +++ /dev/null @@ -1 +0,0 @@ -@platform_directory_path = '../leap_platform' diff --git a/provider/nodes/turtle.json b/provider/nodes/turtle.json index 4391736..47ca51d 100644 --- a/provider/nodes/turtle.json +++ b/provider/nodes/turtle.json @@ -1,5 +1,5 @@ { - "services": "webapp", + "services": [ "webapp", "monitor" ], "tags": "production", "ip_address": "176.53.69.119", "ssh": { |