aptcacher renamed to apt_cacher_ng
diff --git a/README.rst b/README.rst
index 175a72f..2795d0e 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@
.. code-block:: yaml
- apt-cacher:
+ apt_cacher_ng:
server:
enabled: true
bind:
@@ -24,7 +24,7 @@
.. code-block:: yaml
- aptcacher:
+ apt_cacher_ng:
server:
enabled: true
bind:
diff --git a/aptcacher/files/acng.conf.Debian b/apt_cacher_ng/files/acng.conf.Debian
similarity index 89%
rename from aptcacher/files/acng.conf.Debian
rename to apt_cacher_ng/files/acng.conf.Debian
index 3ec1bc9..803ef03 100644
--- a/aptcacher/files/acng.conf.Debian
+++ b/apt_cacher_ng/files/acng.conf.Debian
@@ -1,4 +1,4 @@
-{%- from "aptcacher/map.jinja" import server with context %}
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
CacheDir: /var/cache/apt-cacher-ng
LogDir: /var/log/apt-cacher-ng
SupportDir: /usr/lib/apt-cacher-ng
diff --git a/apt_cacher_ng/init.sls b/apt_cacher_ng/init.sls
new file mode 100644
index 0000000..3b2573c
--- /dev/null
+++ b/apt_cacher_ng/init.sls
@@ -0,0 +1,5 @@
+
+include:
+{%- if pillar.apt_cacher_ng.server is defined %}
+- apt_cacher_ng.server
+{%- endif %}
diff --git a/aptcacher/map.jinja b/apt_cacher_ng/map.jinja
similarity index 83%
rename from aptcacher/map.jinja
rename to apt_cacher_ng/map.jinja
index 7a6f0b4..35e33b1 100644
--- a/aptcacher/map.jinja
+++ b/apt_cacher_ng/map.jinja
@@ -9,4 +9,4 @@
'services': ['apt-cacher'],
'notification': False,
},
- }, merge=pillar.aptcacher.get('server', {})) %}
+ }, merge=pillar.apt_cacher_ng.get('server', {})) %}
diff --git a/aptcacher/meta/sensu.yml b/apt_cacher_ng/meta/sensu.yml
similarity index 88%
rename from aptcacher/meta/sensu.yml
rename to apt_cacher_ng/meta/sensu.yml
index c58a28c..4300306 100644
--- a/aptcacher/meta/sensu.yml
+++ b/apt_cacher_ng/meta/sensu.yml
@@ -1,6 +1,6 @@
# Sample check
check:
- local_aptcacher_proc:
+ local_apt_cacher_ng_proc:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C apt-cacher -u apt-cacher -c 1:1"
interval: 60
occurrences: 1
diff --git a/aptcacher/meta/sphinx.yml b/apt_cacher_ng/meta/sphinx.yml
similarity index 69%
rename from aptcacher/meta/sphinx.yml
rename to apt_cacher_ng/meta/sphinx.yml
index 311215e..0b4f295 100644
--- a/aptcacher/meta/sphinx.yml
+++ b/apt_cacher_ng/meta/sphinx.yml
@@ -1,7 +1,7 @@
-{%- from "aptcacher/map.jinja" import server with context %}
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
# Fill in documentation details
doc:
- name: aptcacher
+ name: apt_cacher_ng
description: Some service info
role:
server:
diff --git a/aptcacher/server.sls b/apt_cacher_ng/server.sls
similarity index 64%
rename from aptcacher/server.sls
rename to apt_cacher_ng/server.sls
index 88ccf16..8149ef5 100644
--- a/aptcacher/server.sls
+++ b/apt_cacher_ng/server.sls
@@ -1,7 +1,7 @@
-{%- from "aptcacher/map.jinja" import server with context %}
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
{%- if server.enabled %}
-aptcacher_packages:
+apt_cacher_ng_packages:
pkg.installed:
- names: {{ server.pkgs }}
@@ -12,13 +12,13 @@
/etc/apt-cacher-ng/acng.conf:
file.managed:
- - source: salt://aptcacher/files/acng.conf.{{ grains.os_family }}
+ - source: salt://apt_cacher_ng/files/acng.conf.{{ grains.os_family }}
- template: jinja
- require:
- file: /etc/apt-cacher-ng
- - pkg: aptcacher_packages
+ - pkg: apt_cacher_ng_packages
-aptcacher_services:
+apt_cacher_ng_services:
service.running:
- enable: true
- names: {{ server.services }}
diff --git a/aptcacher/init.sls b/aptcacher/init.sls
deleted file mode 100644
index 12e633c..0000000
--- a/aptcacher/init.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-
-include:
-{%- if pillar.aptcacher.server is defined %}
-- aptcacher.server
-{%- endif %}
diff --git a/metadata.yml b/metadata.yml
index 0a4afd8..23927a6 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
-name: "apt-cacher-ng"
+name: "apt_cacher_ng"
version: "0.1"
source: "https://github.com/salt-formula/salt-formula-apt-cacher-ng"
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index d45f791..3c25a6e 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,9 +1,9 @@
applications:
-- aptcacher
+- apt_cacher_ng
classes:
-- service.aptcacher.support
+- service.apt_cacher_ng.support
parameters:
- aptcacher:
+ apt_cacher_ng:
server:
enabled: true
bind:
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 61cf216..fb6744c 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -1,5 +1,5 @@
parameters:
- aptcacher:
+ apt_cacher_ng:
_support:
collectd:
enabled: false
diff --git a/tests/pillar/single.yml b/tests/pillar/single.yml
index 8f00341..9554a09 100644
--- a/tests/pillar/single.yml
+++ b/tests/pillar/single.yml
@@ -1,4 +1,4 @@
-aptcacher:
+apt_cacher_ng:
server:
enabled: true
bind: