diff --git a/apt-cacher/ng/client/config/file.sls b/apt-cacher/ng/client/config/file.sls index 72bb816..cd696a3 100644 --- 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 b/apt-cacher/ng/files/default/client.conf similarity index 100% rename from apt-cacher/ng/files/default/client.conf.tmpl rename to apt-cacher/ng/files/default/client.conf diff --git a/apt-cacher/ng/files/default/security.conf.tmpl b/apt-cacher/ng/files/default/security.conf similarity index 100% rename from apt-cacher/ng/files/default/security.conf.tmpl rename to apt-cacher/ng/files/default/security.conf diff --git a/apt-cacher/ng/files/default/server.conf.tmpl b/apt-cacher/ng/files/default/server.conf similarity index 100% rename from apt-cacher/ng/files/default/server.conf.tmpl rename to 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 index ac80eea..e904198 100644 --- 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 )