From 06cbe75d8a0ab6bee151d6aca542d8ed14939acc Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Sun, 28 Jul 2013 01:04:12 +0200 Subject: [PATCH 1/5] Add pillar.example --- pillar.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pillar.example diff --git a/pillar.example b/pillar.example new file mode 100644 index 0000000..e69de29 From e9e68bd8db8aeab37e9052a765368cdd34f07033 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Sun, 28 Jul 2013 01:04:22 +0200 Subject: [PATCH 2/5] Add LICENSE. --- LICENSE | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..52ec1c1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,14 @@ + Copyright (c) 2013 Salt Stack Formulas + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + From 2390588eb76c4239bcefb927eff553f322675250 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Sun, 28 Jul 2013 01:04:40 +0200 Subject: [PATCH 3/5] Move README to rst --- README.md => README.rst | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.md => README.rst (100%) diff --git a/README.md b/README.rst similarity index 100% rename from README.md rename to README.rst From 6c6d89ca1e69931627efa0f837de1e248bb26e97 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Sun, 28 Jul 2013 01:04:55 +0200 Subject: [PATCH 4/5] Move templates to reflect formula guide. --- nginx/{templates => files}/config.jinja | 0 nginx/{templates => files}/upstart-logger.jinja | 0 nginx/{templates => files}/upstart.jinja | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename nginx/{templates => files}/config.jinja (100%) rename nginx/{templates => files}/upstart-logger.jinja (100%) rename nginx/{templates => files}/upstart.jinja (100%) diff --git a/nginx/templates/config.jinja b/nginx/files/config.jinja similarity index 100% rename from nginx/templates/config.jinja rename to nginx/files/config.jinja diff --git a/nginx/templates/upstart-logger.jinja b/nginx/files/upstart-logger.jinja similarity index 100% rename from nginx/templates/upstart-logger.jinja rename to nginx/files/upstart-logger.jinja diff --git a/nginx/templates/upstart.jinja b/nginx/files/upstart.jinja similarity index 100% rename from nginx/templates/upstart.jinja rename to nginx/files/upstart.jinja From 7c16f55a58e3799dc3f52c3584b3af3aa7e9a5f2 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Sun, 28 Jul 2013 01:05:46 +0200 Subject: [PATCH 5/5] Reflect template move in files. --- nginx/init.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx/init.sls b/nginx/init.sls index 75c1380..76abec0 100644 --- a/nginx/init.sls +++ b/nginx/init.sls @@ -13,7 +13,7 @@ include: - user: root - group: root - mode: 440 - - source: salt://nginx/templates/config.jinja + - source: salt://nginx/files/config.jinja - require: - pkg: nginx @@ -61,7 +61,7 @@ nginx-logger-{{ log_type }}: - user: root - group: root - mode: 440 - - source: salt://nginx/templates/upstart-logger.jinja + - source: salt://nginx/files/upstart-logger.jinja - context: type: {{ log_type }} service: @@ -87,7 +87,7 @@ nginx: - user: root - group: root - mode: 440 - - source: salt://nginx/templates/upstart.jinja + - source: salt://nginx/files/upstart.jinja - require: - pkg: nginx - file: nginx-old-init