12 Commits

Author	SHA1	Message	Date
Antsiferov Grigory	3eb838670a	Merge updated nginx states, update elastic_json and elastic_tls_client log formats;	2017-04-19 14:43:58 +03:00
Antsiferov Grigory	5474d375d6	Move include /etc/nginx/main.d/*.conf before events section;	2017-04-06 17:32:45 +03:00
Antsiferov Grigory	4051eea75f	Remove that last tengine if from nginx states;	2017-04-06 16:58:35 +03:00
Antsiferov Grigory	8c01ce5a17	Remove tengine if's from nginx states, add main.d and conf.d directories;	2017-04-06 13:40:33 +03:00
Antsiferov Grigory	5f5d8b70b2	Update elastic_json formatting to more closely match our standard one;	2017-03-13 17:19:42 +03:00
Antsiferov Grigory	6f7d27dd10	Add -libatomic to nginx use flags and remove the deprecated spdy module;	2017-03-09 18:43:20 +03:00
Antsiferov Grigory	8042631fc8	Add escape=json to elastic log format;	2017-03-09 18:14:36 +03:00
Antsiferov Grigory	ef23145e2c	sls/nginx/nginx.conf.tpl: Add conf.d include and elastic format log.	2017-03-09 14:45:58 +03:00
Antsiferov Grigory	8db5bf1f5c	sls/nginx/nginx.conf.tpl: update config template for nginx;	2016-11-21 10:25:29 +03:00
Antsiferov Grigory	7642ec311d	sls/nginx/init.sls: update tengine states;	2016-11-20 19:04:27 +03:00
Antsiferov Grigory	202702ae81	sls/nginx: update tengine configuration;	2016-11-20 17:50:19 +03:00
Regna	bf63987f34	Initial import	2016-04-17 02:52:58 +03:00