From 0c2aae7b9dbe24ace3a71aff082d53cf20078f8c Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Jul 10 2020 21:04:39 +0000 Subject: Merge branch 'hellcp/jekyll-monitor' into 'production' Add monitor to jekyll See merge request infra/salt!418 --- diff --git a/pillar/role/jekyll_master.sls b/pillar/role/jekyll_master.sls index 2c21289..08eba4b 100644 --- a/pillar/role/jekyll_master.sls +++ b/pillar/role/jekyll_master.sls @@ -19,6 +19,8 @@ profile: 101.opensuse.org: repo: https://github.com/openSUSE/mentoring.git branch: gh-pages + monitor.opensuse.org: + repo: https://github.com/openSUSE/monitor-o-o.git server_list: - jekyll.infra.opensuse.org ssh_known_hosts: | diff --git a/pillar/role/web_jekyll.sls b/pillar/role/web_jekyll.sls index 1ba2a8f..800e0ef 100644 --- a/pillar/role/web_jekyll.sls +++ b/pillar/role/web_jekyll.sls @@ -1,4 +1,4 @@ -{% set websites = ['news', 'planet', 'search', 'www', 'yast', '101'] %} +{% set websites = ['news', 'planet', 'search', 'www', 'yast', '101', 'monitor'] %} include: - role.common.nginx