diff options
| author | kwadronaut <kwadronaut@leap.se> | 2013-11-24 12:30:07 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2013-11-24 12:30:07 +0100 |
| commit | ff44bc75b814700f65459f990bfb6c078c876483 (patch) | |
| tree | ec42a235c944c31c6886d67baeebe72affb1a4d6 /services | |
| parent | 478d964b79d3f72d233fa2e53d2c00dbc6f05a96 (diff) | |
| parent | c73f755a3db36bf9eea411bae91da5e84f158cdc (diff) | |
Merge branch 'develop'
Conflicts:
Leapfile
files/ssh/authorized_keys
Diffstat (limited to 'services')
| -rw-r--r-- | services/backup.json | 1 | ||||
| -rw-r--r-- | services/ca.json | 5 | ||||
| -rw-r--r-- | services/mx.json | 1 | ||||
| -rw-r--r-- | services/webapp.json | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/services/backup.json b/services/backup.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/services/backup.json @@ -0,0 +1 @@ +{} diff --git a/services/ca.json b/services/ca.json deleted file mode 100644 index 6661313..0000000 --- a/services/ca.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ca_daemon": { - "couchdb_user": "= global.services[:couchdb].couch.users[:admin]" - } -} diff --git a/services/mx.json b/services/mx.json index 2c63c08..7c25754 100644 --- a/services/mx.json +++ b/services/mx.json @@ -1,2 +1,3 @@ { + "service_type": "user_service" } diff --git a/services/webapp.json b/services/webapp.json index 4bd9b50..cd8f7e7 100644 --- a/services/webapp.json +++ b/services/webapp.json @@ -1,5 +1,9 @@ { "webapp": { - "couchdb_user": "= global.services[:couchdb].couch.users[:admin]" + "admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "etest1", "meanderingcode"], + "git": { + "source": "https://github.com/elijh/leap_web", + "revision": "origin/feature/customize" + } } -}
\ No newline at end of file +} |