Merge pull request #2 from stp-ip/new_structure

Restructure according to new guidelines.

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.
+

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