From 129de273e9418ad12f43d382fd29b353aee6cf9f Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Jul 11 2024 13:59:10 +0000 Subject: Remove remnants of people01/02 distinction Since people02 is gone, all the special cases aren’t necessary anymore. Signed-off-by: Nils Philippsen --- diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 69c2c17..3673a0b 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -29,7 +29,6 @@ passno=0 dump=0 state=mounted - when: inventory_hostname.startswith('people01') tags: - mount @@ -42,7 +41,6 @@ passno=0 dump=0 state=mounted - when: inventory_hostname.startswith('people01') tags: - mount diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml index 4a776b4..e368ad4 100644 --- a/roles/people/tasks/main.yml +++ b/roles/people/tasks/main.yml @@ -7,36 +7,12 @@ with_items: - cvs - git - - bzr - mercurial - lftp - quota - nano - - pyliblzma - - libxml2-python - tree # requested in ticket 5148 - mod_ssl - - python36-jinja2 # needed now for make-people-page.py - when: inventory_hostname.startswith('people02') - tags: - - packages - - people - -# -# Install packages needed for fedora people (rhel9) -# -- name: install packages needed for fedora people - package: name={{ item }} state=present - with_items: - - cvs - - git - - mercurial - - lftp - - quota - - nano - - tree # requested in ticket 5148 - - mod_ssl - when: inventory_hostname.startswith('people01') tags: - packages - people @@ -163,25 +139,6 @@ - config - selinux -- name: check the selinux context of the planet dir - command: matchpathcon "/srv/planet" - register: gitcontext - check_mode: no - changed_when: false - when: inventory_hostname.startswith('people02') - tags: - - config - - selinux - -- name: set the SELinux policy for the planet dir - command: semanage fcontext -a -t httpd_sys_content_t "/srv/planet(/.*)?" - when: >- - gitcontext.stdout.find('httpd_sys_content_t') == -1 - and inventory_hostname.startswith('people02') - tags: - - config - - selinux - # This is a file context alias, to let ansible know that /home and /srv/home # are equal as far as contexts are concerned. - name: check the selinux context alias of the home dir