Fix docs and changelog

This commit is contained in:
Denis Zheleztsov 2017-02-07 13:03:46 +03:00
parent d7c0ddf299
commit 3d00f4b713
5 changed files with 1 additions and 23 deletions

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ surok (0.8) testing; urgency=medium
* Version bump * Version bump
* new config structure * new config structure
* Basic consul support * Port type
* Discovery over Marathon API * Discovery over Marathon API
-- Denis Zheleztsov <difrex.punk@gmail.com> Tue, 07 Feb 2017 12:41:52 +0300 -- Denis Zheleztsov <difrex.punk@gmail.com> Tue, 07 Feb 2017 12:41:52 +0300

View File

@ -11,10 +11,6 @@ Default location is **/etc/surok/conf/surok.json**
"force": true, "force": true,
"host": "http://marathon.mesos:8080" "host": "http://marathon.mesos:8080"
}, },
"consul": {
"enabled": false,
"domain": "service.dc1.consul"
},
"mesos":{ "mesos":{
"enabled": true, "enabled": true,
"domain": "marathon.mesos" "domain": "marathon.mesos"
@ -56,9 +52,6 @@ Surok working with folowing systems. If system is disabled parameters will be ig
Enable/disable restarting container Enable/disable restarting container
* **host** - *string. Optional. "http://marathon.mesos:8080" by default* * **host** - *string. Optional. "http://marathon.mesos:8080" by default*
Marathon address. Marathon address.
* For Consul "consul"
* **domain** - *string. Required.*
Consul private domain
* For mesos-dns "mesos" * For mesos-dns "mesos"
* **domain** - *string. Optional. "marathon.mesos" by default* * **domain** - *string. Optional. "marathon.mesos" by default*
mesos-dns private domain mesos-dns private domain
@ -72,7 +65,6 @@ Surok working with folowing systems. If system is disabled parameters will be ig
Accept values: Accept values:
* "mesos_dns" - mesos-dns * "mesos_dns" - mesos-dns
* "marathon_api"- Marathon API * "marathon_api"- Marathon API
* "consul_dns" - Consul
* **confd** - *strig. Required.* * **confd** - *strig. Required.*
Path to directory with app config files. Path to directory with app config files.
* **wait_time** - *int. Required.* * **wait_time** - *int. Required.*

View File

@ -9,14 +9,6 @@
"force": true, "force": true,
"host": "http://marathon.mesos:8080" "host": "http://marathon.mesos:8080"
}, },
"consul": {
"enabled": false,
"domain": "service.dc1.consul"
},
"mesos":{
"enabled": true,
"domain": "marathon.mesos"
},
"default_discovery": "mesos_dns", "default_discovery": "mesos_dns",
"confd": "/etc/surok/conf.d", "confd": "/etc/surok/conf.d",
"wait_time": 20, "wait_time": 20,
@ -53,9 +45,6 @@
Вкл/выкл. рестарта контейнера Вкл/выкл. рестарта контейнера
* **host** - *string. Не обязательный. По умолчанию "http://marathon.mesos:8080".* * **host** - *string. Не обязательный. По умолчанию "http://marathon.mesos:8080".*
Адрес Marathon. Адрес Marathon.
* для Consul "consul"
* **domain** - *string. Обязательный.*
Приватный домен Consul
* для mesos DNS "mesos" * для mesos DNS "mesos"
* **domain** - *string. Не обязательный. По умолчанию "marathon.mesos".* * **domain** - *string. Не обязательный. По умолчанию "marathon.mesos".*
Приватный домен Mesos DNS Приватный домен Mesos DNS
@ -70,7 +59,6 @@
Может принимать значения: Может принимать значения:
* "mesos_dns" - Mesos DNS * "mesos_dns" - Mesos DNS
* "marathon_api"- Marathon API * "marathon_api"- Marathon API
* "consul_dns" - Consul
* **confd** - *strig. Обязательный.* * **confd** - *strig. Обязательный.*
Абсолютный путь до директории с конфигурационными файлами приложений. Абсолютный путь до директории с конфигурационными файлами приложений.
* **wait_time** - *int. Обязательный.* * **wait_time** - *int. Обязательный.*

View File

@ -76,7 +76,6 @@ cd /opt/surok && pip3 install -r requriments.txt
* Tue Feb 7 2017 Denis Zheleztsov <difrex.punk@gmail.com> * Tue Feb 7 2017 Denis Zheleztsov <difrex.punk@gmail.com>
- New major release - New major release
- Discovery over marathon api - Discovery over marathon api
- Basic Consul support
* Mon Nov 14 2016 Denis Zheleztsov <difrex.punk@gmail.com> - * Mon Nov 14 2016 Denis Zheleztsov <difrex.punk@gmail.com> -
- Initial build. - Initial build.

View File

@ -57,7 +57,6 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 7 2017 Denis Zheleztsov <difrex.punk@gmail.com> * Tue Feb 7 2017 Denis Zheleztsov <difrex.punk@gmail.com>
- New major release - New major release
- Discovery over marathon api - Discovery over marathon api
- Basic Consul support
* Mon Nov 14 2016 Denis Zheleztsov <difrex.punk@gmail.com> - * Mon Nov 14 2016 Denis Zheleztsov <difrex.punk@gmail.com> -
- Initial build. - Initial build.