From 0dbe53a796ac188fe82b32b1b0f2af8710264495 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 21 Feb 2017 22:18:29 +0100 Subject: [PATCH] Fixing latest differences with origin/master. --- roles/nethcfg/tasks/samba.yml | 4 ++-- roles/preseed/templates/preseed/aula-trusty.seed | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/nethcfg/tasks/samba.yml b/roles/nethcfg/tasks/samba.yml index a0fcd1c..de3baf8 100644 --- a/roles/nethcfg/tasks/samba.yml +++ b/roles/nethcfg/tasks/samba.yml @@ -13,7 +13,7 @@ # SAMBA -- name: "Verifying modifications on templates-custom." +- name: Verifying modifications on templates-custom. shell: grep -q 'server signing = mandatory' /etc/e-smith/templates-custom/etc/samba/smb.conf/10global register: check_tempcust changed_when: check_tempcust.rc != 0 @@ -21,7 +21,7 @@ - name: "Create directory structure for templates-custom" file: - path: "/etc/e-smith/templates-custom/etc/samba/smb.conf" + path: /etc/e-smith/templates-custom/etc/samba/smb.conf owner: root group: root mode: 0755 diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 5e64442..26bac4c 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -66,7 +66,7 @@ d-i clock-setup/ntp-server string {{ ansible_local.domain.ntpserver }} # User creation d-i passwd/user-fullname string BgLUG User d-i passwd/username string bglug -d-i passwd/user-password-crypted password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ +d-i passwd/user-password-crypted password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free