From b8ebc30ba1c69a37501a1021b9ce3c5baa7548ef Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 19 Dec 2016 14:19:35 +0100 Subject: [PATCH] remove scripts_dir variables --- evolinux-admin-users/README.md | 4 ---- evolinux-admin-users/defaults/main.yml | 4 ---- evolinux-admin-users/tasks/adduser_debian.yml | 4 ++-- evolinux-admin-users/templates/sudoers_debian.j2 | 2 +- evomaintenance/defaults/main.yml | 3 --- evomaintenance/tasks/trap.yml | 4 ++-- listupgrade/defaults/main.yml | 3 --- listupgrade/tasks/main.yml | 4 ++-- listupgrade/templates/listupgrade_cron.j2 | 2 +- 9 files changed, 8 insertions(+), 22 deletions(-) diff --git a/evolinux-admin-users/README.md b/evolinux-admin-users/README.md index e98f70c2..2ea3bdf0 100644 --- a/evolinux-admin-users/README.md +++ b/evolinux-admin-users/README.md @@ -23,7 +23,3 @@ evolinux_admin_users: password_hash: 'gsdfgsdfgsdfgsdf' ssh_key: 'ssh-rsa QWERTYUIOP' ``` - -* `general_scripts_dir`: general directory for scripts installation (default: `/usr/local/bin`). -* `listupgrade_scripts_dir`: script directory for listupgrade (default: `general_scripts_dir`). -* `evomaintenance_scripts_dir`: script directory for evomaintenance (default: `general_scripts_dir`). diff --git a/evolinux-admin-users/defaults/main.yml b/evolinux-admin-users/defaults/main.yml index f0b78dba..5ff148a2 100644 --- a/evolinux-admin-users/defaults/main.yml +++ b/evolinux-admin-users/defaults/main.yml @@ -1,6 +1,2 @@ --- evolinux_admin_users: [] - -general_scripts_dir: "/usr/local/bin" -evomaintenance_scripts_dir: Null -listupgrade_scripts_dir: Null diff --git a/evolinux-admin-users/tasks/adduser_debian.yml b/evolinux-admin-users/tasks/adduser_debian.yml index 4cbbecf8..1138d411 100644 --- a/evolinux-admin-users/tasks/adduser_debian.yml +++ b/evolinux-admin-users/tasks/adduser_debian.yml @@ -35,7 +35,7 @@ - name: is evomaintenance installed? stat: - path: "{{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}/evomaintenance.sh" + path: "/usr/share/scripts/evomaintenance.sh" register: evomaintenance_script - name: Add evomaintenance trap for '{{ user.name }}' @@ -43,7 +43,7 @@ state: present dest: '/home/{{ user.name }}/.profile' insertafter: EOF - line: 'trap "sudo {{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}/evomaintenance.sh" 0' + line: 'trap "sudo /usr/share/scripts/evomaintenance.sh" 0' when: evomaintenance_script.stat.exists - name: Create .ssh directory for '{{ user.name }}' diff --git a/evolinux-admin-users/templates/sudoers_debian.j2 b/evolinux-admin-users/templates/sudoers_debian.j2 index 88ef5f98..ab5a0b5c 100644 --- a/evolinux-admin-users/templates/sudoers_debian.j2 +++ b/evolinux-admin-users/templates/sudoers_debian.j2 @@ -1,6 +1,6 @@ Defaults umask=0077 -Cmnd_Alias MAINT = {{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}/evomaintenance.sh, {{ listupgrade_scripts_dir or general_scripts_dir | mandatory }}/listupgrade.sh, /usr/bin/apt, /bin/mount +Cmnd_Alias MAINT = /usr/share/scripts/evomaintenance.sh, /usr/share/scripts/listupgrade.sh, /usr/bin/apt, /bin/mount User_Alias ADMINS = {{ user.name }} nagios ALL = NOPASSWD: /usr/lib/nagios/plugins/check_procs diff --git a/evomaintenance/defaults/main.yml b/evomaintenance/defaults/main.yml index 80c7c189..fc584481 100644 --- a/evomaintenance/defaults/main.yml +++ b/evomaintenance/defaults/main.yml @@ -2,9 +2,6 @@ general_alert_email: "root@localhost" evomaintenance_alert_email: Null -general_scripts_dir: "/usr/local/bin" -evomaintenance_scripts_dir: Null - evomaintenance_hostname: "{{ ansible_fqdn }}" evomaintenance_pg_host: Null diff --git a/evomaintenance/tasks/trap.yml b/evomaintenance/tasks/trap.yml index b3c0ef80..56e7e0b5 100644 --- a/evomaintenance/tasks/trap.yml +++ b/evomaintenance/tasks/trap.yml @@ -6,7 +6,7 @@ - name: install shell trap in {{ home }}/.bash_profile lineinfile: dest: "{{ home }}/.bash_profile" - line: "trap \"sudo {{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}/evomaintenance.sh\" 0" + line: "trap \"sudo /usr/share/scripts/evomaintenance.sh\" 0" insertafter: EOF create: no when: bash_profile.stat.exists @@ -20,7 +20,7 @@ - name: install shell trap in {{ home }}/.profile lineinfile: dest: "{{ home }}/.profile" - line: "trap \"sudo {{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}/evomaintenance.sh\" 0" + line: "trap \"sudo /usr/share/scripts/evomaintenance.sh\" 0" insertafter: EOF create: yes when: not bash_profile.stat.exists diff --git a/listupgrade/defaults/main.yml b/listupgrade/defaults/main.yml index 0f0f1395..3f72fbff 100644 --- a/listupgrade/defaults/main.yml +++ b/listupgrade/defaults/main.yml @@ -1,6 +1,3 @@ --- general_alert_email: "root@localhost" listupgrade_alert_email: Null - -general_scripts_dir: "/usr/local/bin" -listupgrade_scripts_dir: Null diff --git a/listupgrade/tasks/main.yml b/listupgrade/tasks/main.yml index e2f67284..e164fc51 100644 --- a/listupgrade/tasks/main.yml +++ b/listupgrade/tasks/main.yml @@ -1,14 +1,14 @@ --- - name: Scripts dir is present file: - path: "{{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}" + path: "/usr/share/scripts" state: directory mode: 0700 - name: Copy listupgrade script template: src: listupgrade.sh.j2 - dest: "{{ evomaintenance_scripts_dir or general_scripts_dir | mandatory }}/listupgrade.sh" + dest: "/usr/share/scripts/listupgrade.sh" mode: 0700 owner: root group: root diff --git a/listupgrade/templates/listupgrade_cron.j2 b/listupgrade/templates/listupgrade_cron.j2 index 0e284d65..0c21341c 100644 --- a/listupgrade/templates/listupgrade_cron.j2 +++ b/listupgrade/templates/listupgrade_cron.j2 @@ -1 +1 @@ -42 9 * * 2 root {{ listupgrade_scripts_dir or general_scripts_dir | mandatory }}/listupgrade.sh --cron +42 9 * * 2 root /usr/share/scripts/listupgrade.sh --cron