merge origin/master

2019-08-05 03:43:48 +08:00
parent 28e82813c4 8254c34647
commit da8f0d0864
81 changed files with 7296 additions and 1036 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,4 +5,12 @@
 /.project
 .docker-sync
 /jenkins/jenkins_home
-/nginx/ssl/
+
+/logstash/pipeline/*.conf
+/logstash/config/pipelines.yml
+
+/nginx/ssl/*.crt
+/nginx/ssl/*.key
+/nginx/ssl/*.csr
+
+.DS_Store