Merge pull request #15 from subutai-io/dev

Dev to master
subutai-io · Jan 30, 2019 · 874f364 · 874f364
2 parents 3b28883 + 89308c6
commit 874f364
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -93,10 +93,8 @@ def notifyBuild(String buildStatus = 'STARTED', String details = '') {
     colorCode = '#FF0000'
 	summary = "${subject} (${env.BUILD_URL})${details}"
   }
-  // Get token
-  def slackToken = getSlackToken('sysnet')
-  // Send notifications
-  slackSend (color: colorCode, message: summary, teamDomain: 'optdyn', token: "${slackToken}")
+	def mattermost_rest = "https://mm.optdyn.com/hooks/k1ujhg8xwigupxjzqbwzpgdp3h"
+ 	mattermostSend(color: colorCode, icon: "https://jenkins.io/images/logos/jenkins/jenkins.png", message: summary, channel: "#sysnet-bots", endpoint: "${mattermost_rest}" )
 }
 
 // get slack token from global jenkins credentials store

diff --git a/debian/tree/nginx/nginx.conf b/debian/tree/nginx/nginx.conf
@@ -45,7 +45,7 @@ http {
         listen 443 ssl default_server;
         ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
         ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-        return 404; # or whatever
+        return 444; # or whatever
     }
 
     server {