diff --git a/firstsetup.yml b/init.yml similarity index 79% rename from firstsetup.yml rename to init.yml index e9aa5d2..73deca3 100644 --- a/firstsetup.yml +++ b/init.yml @@ -4,4 +4,4 @@ vars: - ansible_ssh_user: root roles: - - firstsetup + - init diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml deleted file mode 100644 index 529e380..0000000 --- a/roles/base/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- include: add_centos_repos.yml -- include: packages.yml -- include: clearos_pkg.yml -- include: ansible.yml diff --git a/roles/firstsetup/defaults/main.yml b/roles/init/defaults/main.yml similarity index 100% rename from roles/firstsetup/defaults/main.yml rename to roles/init/defaults/main.yml diff --git a/roles/firstsetup/tasks/main.yml b/roles/init/tasks/main.yml similarity index 100% rename from roles/firstsetup/tasks/main.yml rename to roles/init/tasks/main.yml diff --git a/roles/firstsetup/tasks/mgmtuser.yml b/roles/init/tasks/mgmtuser.yml similarity index 100% rename from roles/firstsetup/tasks/mgmtuser.yml rename to roles/init/tasks/mgmtuser.yml diff --git a/roles/firstsetup/tasks/ssh-keygen.yml b/roles/init/tasks/ssh-keygen.yml similarity index 100% rename from roles/firstsetup/tasks/ssh-keygen.yml rename to roles/init/tasks/ssh-keygen.yml diff --git a/roles/base/tasks/ansible.yml b/roles/setup/tasks/ansible.yml similarity index 100% rename from roles/base/tasks/ansible.yml rename to roles/setup/tasks/ansible.yml diff --git a/roles/base/tasks/add_centos_repos.yml b/roles/setup/tasks/centos_addrepos.yml similarity index 87% rename from roles/base/tasks/add_centos_repos.yml rename to roles/setup/tasks/centos_addrepos.yml index d93808c..9282123 100644 --- a/roles/base/tasks/add_centos_repos.yml +++ b/roles/setup/tasks/centos_addrepos.yml @@ -22,14 +22,16 @@ tags: repo - name: Copio i repository - shell: cp -f /tmp/centos-release/etc/yum.repos.d/* /etc/yum.repos.d/ + shell: cp -f /tmp/centos-release/etc/yum.repos.d/{{ item }} /etc/yum.repos.d/ + with_items: centos_repo_files sudo: yes when: check_repos|failed register: centos_repo_installed tags: repo - name: Copio le chiavi di firma GPG - shell: cp -f /tmp/centos-release/etc/pki/rpm-gpg/* /etc/pki/rpm-gpg/ + shell: cp -f /tmp/centos-release/etc/pki/rpm-gpg/{{ item }} /etc/pki/rpm-gpg/ + with_items: centos_gpg_files sudo: yes when: check_repos|failed tags: repo diff --git a/roles/setup/tasks/centos_delrepos.yml b/roles/setup/tasks/centos_delrepos.yml new file mode 100644 index 0000000..99fa044 --- /dev/null +++ b/roles/setup/tasks/centos_delrepos.yml @@ -0,0 +1,15 @@ +--- + +- name: Rimozione repository centrali CentOS 6 + shell: rm -f /etc/yum.repos.d/{{ item }} + with_items: centos_repo_files + sudo: yes + +- name: Rimozione firme GPG repository CentOS 6 + shell: rm -f /etc/pki/rpm-gpg/{{ item }} + with_items: centos_gpg_files + sudo: yes + +- name: Ripristino repository ad originali + shell: yum clean all && yum repolist + sudo: yes diff --git a/roles/base/tasks/clearos_pkg.yml b/roles/setup/tasks/clearos_pkgs.yml similarity index 96% rename from roles/base/tasks/clearos_pkg.yml rename to roles/setup/tasks/clearos_pkgs.yml index 4e624a3..1a7d8b9 100644 --- a/roles/base/tasks/clearos_pkg.yml +++ b/roles/setup/tasks/clearos_pkgs.yml @@ -6,7 +6,7 @@ with_items: - app-content-filter - app-web-proxy - - app-filter-proxy-report + - app-proxy-report - app-openldap-directory - app-ntp - app-configuration-backup diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml new file mode 100644 index 0000000..bfff07d --- /dev/null +++ b/roles/setup/tasks/main.yml @@ -0,0 +1,7 @@ +--- + +- include: clearos_pkgs.yml +- include: centos_addrepos.yml +- include: packages.yml +- include: centos_delrepos.yml +- include: ansible.yml diff --git a/roles/base/tasks/packages.yml b/roles/setup/tasks/packages.yml similarity index 100% rename from roles/base/tasks/packages.yml rename to roles/setup/tasks/packages.yml diff --git a/roles/setup/vars/main.yml b/roles/setup/vars/main.yml new file mode 100644 index 0000000..c1a0536 --- /dev/null +++ b/roles/setup/vars/main.yml @@ -0,0 +1,12 @@ +centos_repo_files: + - CentOS-Base.repo + - CentOS-Debuginfo.repo + - CentOS-fasttrack.repo + - CentOS-Media.repo + - CentOS-Vault.repo + +centos_gpg_files: + - RPM-GPG-KEY-CentOS-6 + - RPM-GPG-KEY-CentOS-Security-6 + - RPM-GPG-KEY-CentOS-Debug-6 + - RPM-GPG-KEY-CentOS-Testing-6 diff --git a/server.yml b/setup.yml similarity index 71% rename from server.yml rename to setup.yml index b39cc3e..12e7768 100644 --- a/server.yml +++ b/setup.yml @@ -2,4 +2,4 @@ - hosts: server roles: - - base + - setup