[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Check gerrit2 instead of gerrit for http domain for now

2017-09-11 Thread Paladox (Code Review)
Paladox has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377360 )

Change subject: Check gerrit2 instead of gerrit for http domain for now
..


Check gerrit2 instead of gerrit for http domain for now

This can be reverted when i can get lets encrypt to work with 
gerrit.git.wmflabs.org

Change-Id: I3f8b7010bef7fd496997fb28db28cc724a24f41d
---
M templates/hosts.conf.erb
1 file changed, 18 insertions(+), 1 deletion(-)

Approvals:
  Paladox: Verified; Looks good to me, approved



diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index e9ccc0b..8e0c25d 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -142,6 +142,7 @@
 }
 }
 
+/* can be re enabled once it works with letsencrypt
 object Host "gerrit.git.wmflabs.org" {
  import "generic-host"
  address = "gerrit.git.wmflabs.org"
@@ -156,7 +157,23 @@
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
groups = [ "icingaadmins" ]
  }
- }
+}*/
+
+object Host "gerrit2.git.wmflabs.org" {
+ import "generic-host"
+ address = "gerrit2.git.wmflabs.org"
+ vars.os = "Linux OS"
+ vars.sla = "24x7"
+ vars.load_check = "disable"
+ vars.website_name = "gerrit2.git.wmflabs.org"
+ vars.website_url = "/r/"
+ vars.ssh_check = "disable"
+
+ vars.notification["mail"] = {
+   /* The UserGroup `icingaadmins` is defined in `users.conf`. */
+   groups = [ "icingaadmins" ]
+ }
+}
 
 object Host "gerrit-jenkins.wmflabs.org" {
  import "generic-host"

-- 
To view, visit https://gerrit.wikimedia.org/r/377360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f8b7010bef7fd496997fb28db28cc724a24f41d
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Check gerrit2 instead of gerrit for http domain for now

2017-09-11 Thread Paladox (Code Review)
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377360 )

Change subject: Check gerrit2 instead of gerrit for http domain for now
..

Check gerrit2 instead of gerrit for http domain for now

This can be reverted when i can get lets encrypt to work with 
gerrit.git.wmflabs.org

Change-Id: I3f8b7010bef7fd496997fb28db28cc724a24f41d
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/60/377360/1


-- 
To view, visit https://gerrit.wikimedia.org/r/377360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f8b7010bef7fd496997fb28db28cc724a24f41d
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits