From 51daad59786a5b054f2ac60ab5353fc79707cacf Mon Sep 17 00:00:00 2001
From: dbshah12 <dhruvin.shah@delphix.com>
Date: Thu, 3 Oct 2024 19:59:18 +0530
Subject: [PATCH] DLPX-86537 Moved changes to files of etc folder

---
 files/common/etc/logrotate.d/sudo-log         | 10 ++++++
 files/common/etc/sudoers.d/delphix            |  4 ++-
 .../roles/delphix-platform/tasks/main.yml     | 34 -------------------
 3 files changed, 13 insertions(+), 35 deletions(-)
 create mode 100644 files/common/etc/logrotate.d/sudo-log

diff --git a/files/common/etc/logrotate.d/sudo-log b/files/common/etc/logrotate.d/sudo-log
new file mode 100644
index 00000000..d6ec300b
--- /dev/null
+++ b/files/common/etc/logrotate.d/sudo-log
@@ -0,0 +1,10 @@
+#
+# Copyright 2024 Delphix
+#
+/var/log/sudo.log {
+    weekly
+    rotate 4
+    compress
+    missingok
+    notifempty
+}
\ No newline at end of file
diff --git a/files/common/etc/sudoers.d/delphix b/files/common/etc/sudoers.d/delphix
index a350907f..e72248bd 100644
--- a/files/common/etc/sudoers.d/delphix
+++ b/files/common/etc/sudoers.d/delphix
@@ -1,5 +1,5 @@
 #
-# Copyright 2018 Delphix
+# Copyright 2018, 2024 Delphix
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,3 +15,5 @@
 #
 
 delphix ALL=(ALL) NOPASSWD:ALL
+Defaults use_pty
+Defaults logfile=/var/log/sudo.log
diff --git a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
index e2002428..36f1956a 100644
--- a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
+++ b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
@@ -738,37 +738,3 @@
     path: /etc/environment
     state: absent
     regexp: '^\s*PATH\s*='
-
-
-#
-# Ensure Defaults use_pty is set in /etc/sudoers
-#
-- lineinfile:
-    path: /etc/sudoers
-    state: present
-    regexp: '^Defaults use_pty'
-    line: 'Defaults use_pty'
-
-#
-# Ensure Defaults logfile is set in /etc/sudoers
-#
-- lineinfile:
-    path: /etc/sudoers
-    state: present
-    regexp: '^Defaults logfile=/var/log/sudo.log'
-    line: 'Defaults logfile=/var/log/sudo.log'
-
-#
-# Create logrotate configuration for sudo.log
-#
-- copy:
-    dest: /etc/logrotate.d/sudo-log
-    content: |
-      /var/log/sudo.log {
-          weekly
-          rotate 4
-          compress
-          missingok
-          notifempty
-      }
-    mode: '0644'