From 9eb6dc86cbb78daf41bbdf8264e1e23c0af1b53e Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Jan 14 2018 22:15:04 +0000
Subject: Merge branch 'nginx_formula' into 'production'


add the nginx formula

See merge request infra/salt!152
---

diff --git a/FORMULAS.yaml b/FORMULAS.yaml
index 27124e9..e12b8c1 100644
--- a/FORMULAS.yaml
+++ b/FORMULAS.yaml
@@ -8,6 +8,7 @@ limits:
   namespace: 'ryancurrah'
 locale: {}
 mysql: {}
+nginx: {}
 ntp: {}
 openldap: {}
 openssh: {}
diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls
index f15dca8..8341883 100644
--- a/pillar/role/saltmaster.sls
+++ b/pillar/role/saltmaster.sls
@@ -35,6 +35,7 @@ salt:
       - https://gitlab.infra.opensuse.org/saltstack-formulas/limits-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/locale-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/mysql-formula.git
+      - https://gitlab.infra.opensuse.org/saltstack-formulas/nginx-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/ntp-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/openldap-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/openssh-formula.git