Merge pull request #81 from noelmcloughlin/host2

fix(redhat): use correct location for config file
saltstack-formulas · Jul 14, 2021 · bba0f3f · bba0f3f
2 parents c5f7120 + c0ea529
commit bba0f3f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/rabbitmq/parameters/os_family/RedHat.yaml b/rabbitmq/parameters/os_family/RedHat.yaml
@@ -13,5 +13,5 @@
 ---
 values:
   config:
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
 ...
diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:

diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -26,7 +26,7 @@ values:
       user: rabbit    # 'node' would make more sense here
   config:
     context: {}
-    name: /etc/rabbitmq.conf
+    name: /etc/rabbitmq/rabbitmq.conf
   dir:
     base: /var/lib/rabbitmq
     cleanlist:
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,5 @@ @@
     ---
     values:
       config:
-        name: /etc/rabbitmq.conf
+        name: /etc/rabbitmq/rabbitmq.conf
     ...