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 /tags | |
| parent | 478d964b79d3f72d233fa2e53d2c00dbc6f05a96 (diff) | |
| parent | c73f755a3db36bf9eea411bae91da5e84f158cdc (diff) | |
Merge branch 'develop'
Conflicts:
Leapfile
files/ssh/authorized_keys
Diffstat (limited to 'tags')
| -rw-r--r-- | tags/amsterdam.json | 8 | ||||
| -rw-r--r-- | tags/clientdev.json | 7 | ||||
| -rw-r--r-- | tags/dc.json | 11 | ||||
| -rw-r--r-- | tags/development.json | 4 | ||||
| -rw-r--r-- | tags/hongkong.json | 8 | ||||
| -rw-r--r-- | tags/istanbul.json | 9 | ||||
| -rw-r--r-- | tags/local.json | 3 | ||||
| -rw-r--r-- | tags/phnompenh.json | 8 | ||||
| -rw-r--r-- | tags/production.json | 1 | ||||
| -rw-r--r-- | tags/seattle.json | 8 |
10 files changed, 62 insertions, 5 deletions
diff --git a/tags/amsterdam.json b/tags/amsterdam.json new file mode 100644 index 0000000..3c7b675 --- /dev/null +++ b/tags/amsterdam.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Amsterdam", + "country_code": "NL", + "timezone":"+1", + "hemisphere": "N" + } +} diff --git a/tags/clientdev.json b/tags/clientdev.json new file mode 100644 index 0000000..ea9817f --- /dev/null +++ b/tags/clientdev.json @@ -0,0 +1,7 @@ +{ + "environment": "clientdev", + "domain": { + "full_suffix": "= 'cdev.' + global.provider.domain", + "internal_suffix": "= 'cdev.' + global.provider.domain_internal" + } +}
\ No newline at end of file diff --git a/tags/dc.json b/tags/dc.json new file mode 100644 index 0000000..3a1ee5c --- /dev/null +++ b/tags/dc.json @@ -0,0 +1,11 @@ +{ + "location": { + "name": "Washington D.C.", + "country_code": "US", + "timezone":"-5", + "hemisphere": "N" + }, + "ssh": { + "port": 22 + } +} diff --git a/tags/development.json b/tags/development.json index 4dcf5bb..2c63c08 100644 --- a/tags/development.json +++ b/tags/development.json @@ -1,6 +1,2 @@ { - "production": false, - "ssh": { - "port": 4422 - } } diff --git a/tags/hongkong.json b/tags/hongkong.json new file mode 100644 index 0000000..42eb6d8 --- /dev/null +++ b/tags/hongkong.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Hong Kong", + "country_code": "HK", + "timezone":"+8", + "hemisphere": "N" + } +} diff --git a/tags/istanbul.json b/tags/istanbul.json new file mode 100644 index 0000000..de48db8 --- /dev/null +++ b/tags/istanbul.json @@ -0,0 +1,9 @@ +{ + "location": { + "name": "Istanbul", + "country_code": "TR", + "timezone": "+2", + "hemisphere": "N" + }, + "enabled": "= environment != 'production'" +} diff --git a/tags/local.json b/tags/local.json new file mode 100644 index 0000000..c604987 --- /dev/null +++ b/tags/local.json @@ -0,0 +1,3 @@ +{ + "squid_deb_proxy_client": true +} diff --git a/tags/phnompenh.json b/tags/phnompenh.json new file mode 100644 index 0000000..f9f243c --- /dev/null +++ b/tags/phnompenh.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Phnom Penh", + "country_code": "KH", + "timezone":"+7", + "hemisphere": "N" + } +} diff --git a/tags/production.json b/tags/production.json index 551e323..8212653 100644 --- a/tags/production.json +++ b/tags/production.json @@ -1,5 +1,4 @@ { - "production": true, "ssh": { "port": 4422 } diff --git a/tags/seattle.json b/tags/seattle.json new file mode 100644 index 0000000..b992419 --- /dev/null +++ b/tags/seattle.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Seattle, WA", + "country_code": "US", + "timezone":"-7", + "hemisphere": "N" + } +} |