From 8cc383d53ba9a1a0ff5b5a475e82b910ca1e86bd Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 31 Dec 2018 18:48:44 +0100 Subject: [PATCH] First correction for preseed folders. --- roles/client-install/meta/main.yml | 4 +- .../defaults/main.yml | 0 .../files/apt-mirror-cron | 0 .../files/apt-mirror-logrotate | 0 .../tasks/local-mirror.yml | 0 .../{ubuntu-mirror => mirror}/tasks/main.yml | 0 .../tasks/mirror-cfg.yml | 0 .../tasks/nfs-mirror.yml | 0 .../tasks/remote-mirror.yml | 0 .../templates/apt-mirror.list | 0 roles/preseed/tasks/firefoxcert.yml | 10 ++-- roles/preseed/tasks/preseed.yml | 51 +++++++++---------- roles/preseed/tasks/repoconfig.yml | 16 +++--- ...ug-trusty.list => libreschool-trusty.list} | 0 14 files changed, 38 insertions(+), 43 deletions(-) rename roles/{ubuntu-mirror => mirror}/defaults/main.yml (100%) rename roles/{ubuntu-mirror => mirror}/files/apt-mirror-cron (100%) rename roles/{ubuntu-mirror => mirror}/files/apt-mirror-logrotate (100%) rename roles/{ubuntu-mirror => mirror}/tasks/local-mirror.yml (100%) rename roles/{ubuntu-mirror => mirror}/tasks/main.yml (100%) rename roles/{ubuntu-mirror => mirror}/tasks/mirror-cfg.yml (100%) rename roles/{ubuntu-mirror => mirror}/tasks/nfs-mirror.yml (100%) rename roles/{ubuntu-mirror => mirror}/tasks/remote-mirror.yml (100%) rename roles/{ubuntu-mirror => mirror}/templates/apt-mirror.list (100%) rename roles/preseed/templates/repoconfig/{bglug-trusty.list => libreschool-trusty.list} (100%) diff --git a/roles/client-install/meta/main.yml b/roles/client-install/meta/main.yml index 03b79c9..a2b8062 100644 --- a/roles/client-install/meta/main.yml +++ b/roles/client-install/meta/main.yml @@ -1,7 +1,7 @@ --- dependencies: - - { role: ubuntu-mirror, tags: [ 'client-install' ] } -# - { role: preseed, tags: [ 'client-install' ] } + - { role: mirror, tags: [ 'client-install' ] } + - { role: preseed, tags: [ 'client-install' ] } # - { role: ansible-pull, tags: [ 'client-install' ] } # - { role: doraemon, tags: [ 'client-install' ] } # - { role: npm, tags: [ 'client-install' ] } diff --git a/roles/ubuntu-mirror/defaults/main.yml b/roles/mirror/defaults/main.yml similarity index 100% rename from roles/ubuntu-mirror/defaults/main.yml rename to roles/mirror/defaults/main.yml diff --git a/roles/ubuntu-mirror/files/apt-mirror-cron b/roles/mirror/files/apt-mirror-cron similarity index 100% rename from roles/ubuntu-mirror/files/apt-mirror-cron rename to roles/mirror/files/apt-mirror-cron diff --git a/roles/ubuntu-mirror/files/apt-mirror-logrotate b/roles/mirror/files/apt-mirror-logrotate similarity index 100% rename from roles/ubuntu-mirror/files/apt-mirror-logrotate rename to roles/mirror/files/apt-mirror-logrotate diff --git a/roles/ubuntu-mirror/tasks/local-mirror.yml b/roles/mirror/tasks/local-mirror.yml similarity index 100% rename from roles/ubuntu-mirror/tasks/local-mirror.yml rename to roles/mirror/tasks/local-mirror.yml diff --git a/roles/ubuntu-mirror/tasks/main.yml b/roles/mirror/tasks/main.yml similarity index 100% rename from roles/ubuntu-mirror/tasks/main.yml rename to roles/mirror/tasks/main.yml diff --git a/roles/ubuntu-mirror/tasks/mirror-cfg.yml b/roles/mirror/tasks/mirror-cfg.yml similarity index 100% rename from roles/ubuntu-mirror/tasks/mirror-cfg.yml rename to roles/mirror/tasks/mirror-cfg.yml diff --git a/roles/ubuntu-mirror/tasks/nfs-mirror.yml b/roles/mirror/tasks/nfs-mirror.yml similarity index 100% rename from roles/ubuntu-mirror/tasks/nfs-mirror.yml rename to roles/mirror/tasks/nfs-mirror.yml diff --git a/roles/ubuntu-mirror/tasks/remote-mirror.yml b/roles/mirror/tasks/remote-mirror.yml similarity index 100% rename from roles/ubuntu-mirror/tasks/remote-mirror.yml rename to roles/mirror/tasks/remote-mirror.yml diff --git a/roles/ubuntu-mirror/templates/apt-mirror.list b/roles/mirror/templates/apt-mirror.list similarity index 100% rename from roles/ubuntu-mirror/templates/apt-mirror.list rename to roles/mirror/templates/apt-mirror.list diff --git a/roles/preseed/tasks/firefoxcert.yml b/roles/preseed/tasks/firefoxcert.yml index dd2ab49..12acc48 100644 --- a/roles/preseed/tasks/firefoxcert.yml +++ b/roles/preseed/tasks/firefoxcert.yml @@ -9,7 +9,7 @@ - name: Creo directory per certificati file: - path: /var/lib/nethserver/ibay/ks/server-ca + path: /var/www/html/server-ca state: directory owner: root mode: 0755 @@ -18,13 +18,13 @@ - name: 'Utilizzo cert8.db precedentemente fornito (pulito da FF appena aperto)' copy: src: cert8.db - dest: /var/lib/nethserver/ibay/ks/server-ca/cert8.db + dest: /var/www/html/server-ca/cert8.db owner: root mode: 0644 become: yes - name: Integro la CA nel db - shell: certutil -A -n "{{ ansible_local.domain.domainfull }}" -t "TCu,Cuw,Tuw" -i /tmp/ca.crt -d /var/lib/nethserver/ibay/ks/server-ca + shell: certutil -A -n "{{ ansible_local.domain.domainfull }}" -t "TCu,Cuw,Tuw" -i /tmp/ca.crt -d /var/www/html/server-ca become: yes - name: Pulizia @@ -32,5 +32,5 @@ become: yes with_items: - /tmp/ca.crt - - /var/lib/nethserver/ibay/ks/server-ca/key3.db - - /var/lib/nethserver/ibay/ks/server-ca/secmod.db + - /var/www/html/server-ca/key3.db + - /var/www/html/server-ca/secmod.db diff --git a/roles/preseed/tasks/preseed.yml b/roles/preseed/tasks/preseed.yml index 36a339e..b236d2d 100644 --- a/roles/preseed/tasks/preseed.yml +++ b/roles/preseed/tasks/preseed.yml @@ -5,44 +5,39 @@ edu_package: "{{ ansible_local.domain.edu_package }}" when: ansible_local.domain.edu_package is defined -- name: Verifica configurazione ibay preseed - shell: /sbin/e-smith/db accounts show ks - register: chk_ks_created - changed_when: chk_ks_created.rc != 0 - ignore_errors: yes - become: yes +# Since NS7 web folders are not anymore managed using ibays. +# I have to correct the issue creating manual folder and assigning correct +# permissions. -- name: Configurazione web preseed - shell: /sbin/e-smith/db accounts set ks ibay Description "Preseed share" GroupAccess rw HttpAccess private HttpAliasType default HttpAllowOverrideStatus disabled HttpForceSslStatus disabled HttpPasswordStatus disabled HttpStatus enabled HttpVirtualHost __ANY__ OtherAccess r OwningGroup locals SmbAuditStatus disabled SmbStatus disabled - when: chk_ks_created|failed - become: yes - -- name: Attivazione web preseed - shell: /sbin/e-smith/signal-event ibay-create ks - when: chk_ks_created|failed - become: yes - -- name: Verifica presenza directory mirror - file: path=/var/spool/apt-mirror/mirror state=directory - register: chk_mirror_dir - ignore_errors: yes - become: yes +- name: Creating the kickstart folder + file: + path: /var/www/html/ks + state: directory + owner: root + group: locals + mode: 0755 - name: Collegamento directory mirror - file: path=/var/lib/nethserver/ibay/ks/mirror src=/var/spool/apt-mirror/mirror state=link + file: + path: /var/www/html/ks/mirror + src: /var/spool/apt-mirror/mirror + state: link become: yes - when: chk_mirror_dir|success + when: ansible_local.domain.mirror_mode == 'local' or ansible_local.domain.mirror_mode == 'nfs' - name: Creazione directory preseed file: - path: "/var/lib/nethserver/ibay/ks/preseed" + path: "/var/www/html/ks/preseed" state: directory + owner: root + group: local + mode: 0755 become: yes - name: Copia profili preseed template: src: 'preseed/{{ item }}' - dest: '/var/lib/nethserver/ibay/ks/preseed/{{ item }}' + dest: '/var/www/html/ks/preseed/{{ item }}' with_items: - edubuntu.seed - client-trusty.seed @@ -53,13 +48,13 @@ - block: - name: Creating development directory file: - path: "/var/lib/nethserver/ibay/ks/preseed/dev" + path: "/var/www/html/ks/preseed/dev" state: directory - name: Preseeding profiles - development template: src: 'preseed/dev/{{ item }}' - dest: '/var/lib/nethserver/ibay/ks/preseed/dev/{{ item }}' + dest: '/var/www/html/ks/preseed/dev/{{ item }}' with_items: - client-trusty.seed - docenti-trusty.seed @@ -69,7 +64,7 @@ - name: Copia script post-installazione template: src: 'preseed/{{ item }}' - dest: '/var/lib/nethserver/ibay/ks/preseed/{{ item }}' + dest: '/var/www/html/ks/preseed/{{ item }}' with_items: - postseed-client.sh - postseed-docenti.sh diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml index 26d2640..3fdca14 100644 --- a/roles/preseed/tasks/repoconfig.yml +++ b/roles/preseed/tasks/repoconfig.yml @@ -5,31 +5,31 @@ - name: Creating base directory for storing repositories files file: - path: /var/lib/nethserver/ibay/ks/repoconfig + path: /var/www/html/repoconfig state: directory owner: root - group: root + group: locals mode: 0755 become: yes - name: Preconfiguring base repositories file for clients template: src: repoconfig/sources.list - dest: /var/lib/nethserver/ibay/ks/repoconfig/sources.list + dest: /var/www/html/repoconfig/sources.list owner: root - group: root + group: locals mode: 0644 become: yes - name: Preconfiguring other repositories for clients template: src: "repoconfig/{{ item }}" - dest: "/var/lib/nethserver/ibay/ks/repoconfig/{{ item }}" + dest: "/var/www/html/repoconfig/{{ item }}" owner: root - group: root + group: locals mode: 0644 with_items: - - bglug-trusty.list + - libreschool-trusty.list - ansible-ansible-trusty.list - libreoffice-ppa-trusty.list - epoptes-ppa-trusty.list @@ -39,6 +39,6 @@ - name: Pre-downloading geogebra GPG signature because of HTTPS get_url: url: "https://www.geogebra.net/linux/office@geogebra.org.gpg.key" - dest: "/var/lib/nethserver/ibay/ks/repoconfig/office_geogebra.gpg.key" + dest: "/var/www/html/repoconfig/office_geogebra.gpg.key" validate_certs: no become: yes diff --git a/roles/preseed/templates/repoconfig/bglug-trusty.list b/roles/preseed/templates/repoconfig/libreschool-trusty.list similarity index 100% rename from roles/preseed/templates/repoconfig/bglug-trusty.list rename to roles/preseed/templates/repoconfig/libreschool-trusty.list