fix(states): rename states in a more consistent way

apt-cacher/ng/client/config/file.sls

@@ -9,14 +9,14 @@
 {%- if grains['os_family'] == 'Debian' %}
   {%- if apt_cacher_ng.server_address %}
 
-apt-cacher-ng/config/client_config:
+apt-cacher/ng/client/config/file:
   file.managed:
     - name: {{ apt_cacher_ng.client_config }}
     - user: root
     - group: root
     - mode: '644'
     - source: {{ files_switch(['client.conf.tmpl'],
-                              lookup='apt-cacher-ng/config/client_config'
+                              lookup='apt-cacher/ng/client/config/file'
                  )
               }}
     - template: jinja

apt-cacher/ng/server/config/file.sls

@@ -10,29 +10,29 @@
 include:
   - {{ sls_package_install }}
 
-apt-cacher-ng/group/create:
+apt-cacher/ng/server/config/group/create:
   group.present:
     - name: {{ apt_cacher_ng.group }}
 
-apt-cacher-ng/user/create:
+apt-cacher/ng/server/config/user/create:
   user.present:
     - name: {{ apt_cacher_ng.user }}
 
 {%- if grains['os_family'] == 'FreeBSD' %}
-apt-cacher-ng/user/sysrc:
+apt-cacher/ng/server/config/user/sysrc:
   sysrc.managed:
     - name: apt_cacher_ng_user
     - value: "{{ apt_cacher_ng.user }}"
 {%- endif %}
 
-apt-cacher-ng/config/server_config:
+apt-cacher/ng/server/config/file:
   file.managed:
     - name: {{ apt_cacher_ng.server_config }}
     - user: root
     - group: {{ apt_cacher_ng.root_group }}
     - mode: '644'
     - source: {{ files_switch(['server.conf.tmpl'],
-                              lookup='apt-cacher-ng/config/server_config',
+                              lookup='apt-cacher/ng/server/config/file',
                               use_subpath=True
                  )
               }}
@@ -42,7 +42,7 @@ apt-cacher-ng/config/server_config:
     - context:
         apt_cacher_ng: {{ apt_cacher_ng | json }}
 
-apt-cacher-ng/config/server_cache_dir:
+apt-cacher/ng/server/config/server_cache_dir:
   file.directory:
     - name: {{ apt_cacher_ng.server_cache_dir }}
     - makedirs: true
@@ -50,7 +50,7 @@ apt-cacher-ng/config/server_cache_dir:
     - group: {{ apt_cacher_ng.group }}
     - mode: '2755'
 
-apt-cacher-ng/config/server_log_dir:
+apt-cacher/ng/server/config/server_log_dir:
   file.directory:
     - name: {{ apt_cacher_ng.server_log_dir }}
     - makedirs: true
@@ -58,14 +58,14 @@ apt-cacher-ng/config/server_log_dir:
     - group: {{ apt_cacher_ng.group }}
     - mode: '2755'
 
-apt-cacher-ng/config/credentials:
+apt-cacher/ng/server/config/credentials:
   file.managed:
     - name: {{ apt_cacher_ng.credentials }}
     - user: {{ apt_cacher_ng.user }}
     - group: {{ apt_cacher_ng.group }}
     - mode: '600'
     - source: {{ files_switch(['security.conf.tmpl'],
-                              lookup='apt-cacher-ng/config/credentials',
+                              lookup='apt-cacher/ng/server/config/credentials',
                               use_subpath=True
                  )
               }}

apt-cacher/ng/server/package/install.sls

@@ -5,6 +5,6 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/ng/map.jinja" import apt_cacher_ng with context %}
 
-apt-cacher-ng/package/install:
+apt-cacher/ng/server/package/install:
   pkg.installed:
     - name: {{ apt_cacher_ng.pkg }}

apt-cacher/ng/server/service/running.sls

@@ -14,7 +14,7 @@ include:
 {%- endfor %}
 {%- endif %}
 
-apt-cacher-ng/service/running:
+apt-cacher/ng/server/service/running:
   service.running:
     - name: {{ apt_cacher_ng.service }}
     - enable: true