changes

2025-12-13 08:23:06 -06:00 · 2019-07-11 05:45:24 +00:00
parent 088239cba8
commit 8fbf76ab3e
6 changed files with 11 additions and 18 deletions
--- a/roles/product_startup/tasks/main.yml
+++ b/roles/product_startup/tasks/main.yml
@@ -4,7 +4,9 @@
  template:
    src: "product.service.j2"
    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
-<<<<<<< HEAD
+    owner: root
+    group: root
+    mode: 0640
  when: atl_product_edition != "crowd"
  notify:
    - Enable Product
@@ -14,12 +16,10 @@
  template:
    src: "crowd.service.j2"
    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
-  when: atl_product_edition == "crowd"
-=======
    owner: root
    group: root
    mode: 0640
->>>>>>> origin/master
+  when: atl_product_edition == "crowd"
  notify:
    - Enable Product
    - Restart Product