diff --git a/local.yml b/local.yml index bec3fea..40eb4ec 100644 --- a/local.yml +++ b/local.yml @@ -4,4 +4,5 @@ user: root roles: - init - - common + - base + - domain diff --git a/roles/common/meta/main.yml b/roles/base/meta/main.yml similarity index 100% rename from roles/common/meta/main.yml rename to roles/base/meta/main.yml diff --git a/roles/common/tasks/base-pkgs.yml b/roles/base/tasks/base.yml similarity index 75% rename from roles/common/tasks/base-pkgs.yml rename to roles/base/tasks/base.yml index d7abefd..2c9b8aa 100644 --- a/roles/common/tasks/base-pkgs.yml +++ b/roles/base/tasks/base.yml @@ -44,3 +44,18 @@ - zeitgeist-datahub - epoptes sudo: yes + +- name: Correggo NetworkManager per gestire la rete + lineinfile: + dest: /etc/network/interfaces + regexp: "{{ item }}" + state: absent + with_items: + - ^auto eth0 + - ^iface eth0 + +- name: Cambio greeter di default + lineinfile: + dest: /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf + regexp: "^user-session=ubuntu$" + line: "user-session=gnome-fallback" diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml new file mode 100644 index 0000000..dbe6731 --- /dev/null +++ b/roles/base/tasks/main.yml @@ -0,0 +1,9 @@ +--- +# Configurazioni di base. +# Al termine delle configurazioni di base, avremo un'installazione +# completa di Edubuntu. + +- include: base.yml + tags: + - base + - edubuntu diff --git a/roles/common/tasks/gui-customizations.yml b/roles/common/tasks/gui-customizations.yml deleted file mode 100644 index b6a4abb..0000000 --- a/roles/common/tasks/gui-customizations.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- - -- name: Correggo NetworkManager per gestire la rete - lineinfile: - dest: /etc/network/interfaces - regexp: "{{ item }}" - state: absent - with_items: - - ^auto eth0 - - ^iface eth0 - -- name: Cambio greeter di default - lineinfile: - dest: /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf - regexp: "^user-session=ubuntu$" - line: "user-session=gnome-fallback" - -- name: Altre impostazioni lightdm - lineinfile: - dest: /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf - regexp: "{{ item }}" - line: "{{ item }}" - with_items: - - "allow-guest=false" - - "greeter-hide-users=true" - - "greeter-show-manual-login=true" diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml deleted file mode 100644 index cc4aa30..0000000 --- a/roles/common/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- include: base-pkgs.yml - tags: common - -- include: gui-customizations.yml - tags: - - common - - gui-customizations - -- include: glib2.yml - tags: - - common - - glib2 diff --git a/roles/common/files/com.canonical.indicator.session.gschema.override b/roles/domain/files/com.canonical.indicator.session.gschema.override similarity index 100% rename from roles/common/files/com.canonical.indicator.session.gschema.override rename to roles/domain/files/com.canonical.indicator.session.gschema.override diff --git a/roles/common/files/org.gnome.nautilus.desktop.gschema.override b/roles/domain/files/org.gnome.nautilus.desktop.gschema.override similarity index 100% rename from roles/common/files/org.gnome.nautilus.desktop.gschema.override rename to roles/domain/files/org.gnome.nautilus.desktop.gschema.override diff --git a/roles/domain/meta/main.yml b/roles/domain/meta/main.yml new file mode 100644 index 0000000..4b09db9 --- /dev/null +++ b/roles/domain/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: prereq } diff --git a/roles/domain/tasks/.gui-customizations.yml.swp b/roles/domain/tasks/.gui-customizations.yml.swp new file mode 100644 index 0000000..5ed7b97 Binary files /dev/null and b/roles/domain/tasks/.gui-customizations.yml.swp differ diff --git a/roles/common/tasks/glib2.yml b/roles/domain/tasks/glib2.yml similarity index 100% rename from roles/common/tasks/glib2.yml rename to roles/domain/tasks/glib2.yml diff --git a/roles/domain/tasks/gui-changes.yml b/roles/domain/tasks/gui-changes.yml new file mode 100644 index 0000000..92ddaa8 --- /dev/null +++ b/roles/domain/tasks/gui-changes.yml @@ -0,0 +1,8 @@ +--- +# Cambiamenti all'interfaccia grafica + +- include: lightdm.yml + tags: lightdm + +- include: glib2.yml + tags: glib2 diff --git a/roles/domain/tasks/lightdm.yml b/roles/domain/tasks/lightdm.yml new file mode 100644 index 0000000..97b0de3 --- /dev/null +++ b/roles/domain/tasks/lightdm.yml @@ -0,0 +1,11 @@ +--- + +- name: Altre impostazioni lightdm + lineinfile: + dest: /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf + regexp: "{{ item }}" + line: "{{ item }}" + with_items: + - "allow-guest=false" + - "greeter-hide-users=true" + - "greeter-show-manual-login=true" diff --git a/roles/domain/tasks/main.yml b/roles/domain/tasks/main.yml new file mode 100644 index 0000000..dd2affd --- /dev/null +++ b/roles/domain/tasks/main.yml @@ -0,0 +1,8 @@ +--- +# Configurazioni per messa in dominio. +# Impostazioni grafiche da gestire in dominio + +- include: gui-changes.yml + tags: + - domain + - gui diff --git a/roles/common/templates/apt/sources.list b/roles/domain/templates/apt/sources.list similarity index 100% rename from roles/common/templates/apt/sources.list rename to roles/domain/templates/apt/sources.list diff --git a/roles/init/meta/main.yml b/roles/init/meta/main.yml index f4b6a46..4b09db9 100644 --- a/roles/init/meta/main.yml +++ b/roles/init/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - { role: prereq, tags: [ 'prereq' ] } + - { role: prereq }