fix(tofs): rename default config files

saltstack-formulas · Oct 3, 2019 · a20a724 · a20a724
1 parent 19acc34
commit a20a724
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/apt-cacher/ng/client/config/file.sls b/apt-cacher/ng/client/config/file.sls
@@ -15,7 +15,7 @@ apt-cacher/ng/client/config/file:
     - user: root
     - group: root
     - mode: '644'
-    - source: {{ files_switch(['client.conf.tmpl'],
+    - source: {{ files_switch(['client.conf'],
                               lookup='apt-cacher/ng/client/config/file',
                               use_subpath=True
                  )

diff --git a/apt-cacher/ng/files/default/client.conf.tmpl → apt-cacher/ng/files/default/client.conf b/apt-cacher/ng/files/default/client.conf.tmpl → apt-cacher/ng/files/default/client.conf
diff --git a/...acher/ng/files/default/security.conf.tmpl → apt-cacher/ng/files/default/security.conf b/...acher/ng/files/default/security.conf.tmpl → apt-cacher/ng/files/default/security.conf
diff --git a/apt-cacher/ng/files/default/server.conf.tmpl → apt-cacher/ng/files/default/server.conf b/apt-cacher/ng/files/default/server.conf.tmpl → apt-cacher/ng/files/default/server.conf
diff --git a/apt-cacher/ng/server/config/file.sls b/apt-cacher/ng/server/config/file.sls
@@ -31,7 +31,7 @@ apt-cacher/ng/server/config/file:
     - user: root
     - group: {{ apt_cacher_ng.root_group }}
     - mode: '644'
-    - source: {{ files_switch(['server.conf.tmpl'],
+    - source: {{ files_switch(['server.conf'],
                               lookup='apt-cacher/ng/server/config/file',
                               use_subpath=True
                  )
@@ -64,7 +64,7 @@ apt-cacher/ng/server/config/credentials:
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '600'
-    - source: {{ files_switch(['security.conf.tmpl'],
+    - source: {{ files_switch(['security.conf'],
                               lookup='apt-cacher/ng/server/config/credentials',
                               use_subpath=True
                  )