From 672e110b1f27a7c888c47fe23712617166ec793e Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Sat, 25 Aug 2018 11:05:56 +0200 Subject: [PATCH] ...! --- tasks/arch_CLI_packages.yml | 2 +- tasks/deb_CLI_packages.yml | 2 +- tasks/ssh.yml | 4 ---- tasks/users.yml | 2 +- vars/Bilimbi.yml | 4 +++- vars/common.yml | 1 + 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tasks/arch_CLI_packages.yml b/tasks/arch_CLI_packages.yml index 3cd02dc..5fbe815 100644 --- a/tasks/arch_CLI_packages.yml +++ b/tasks/arch_CLI_packages.yml @@ -33,7 +33,7 @@ - moc - newsboat - pass - when: not minimal + when: not minimal or not server - name: More colorfull pacman lineinfile: diff --git a/tasks/deb_CLI_packages.yml b/tasks/deb_CLI_packages.yml index 7302c1d..fc75a8e 100644 --- a/tasks/deb_CLI_packages.yml +++ b/tasks/deb_CLI_packages.yml @@ -32,4 +32,4 @@ - moc - newsboat - pass - when: not minimal + when: not minimal or not server diff --git a/tasks/ssh.yml b/tasks/ssh.yml index 0347c90..c270c64 100644 --- a/tasks/ssh.yml +++ b/tasks/ssh.yml @@ -18,10 +18,6 @@ line: "PermitRootLogin no" backrefs: yes -- name: debug - debug: - msg: "{{ deploy_public_key }}" - - name: Add public key for deploy user authorized_key: user: "{{ item.username }}" diff --git a/tasks/users.yml b/tasks/users.yml index 251037f..d2db4b0 100644 --- a/tasks/users.yml +++ b/tasks/users.yml @@ -14,5 +14,5 @@ uid: "{{ item.uid }}" shell: /bin/zsh with_items: "{{ me }}" - when: not minimal + when: not minimal or not server diff --git a/vars/Bilimbi.yml b/vars/Bilimbi.yml index 11cf31f..ea1472a 100644 --- a/vars/Bilimbi.yml +++ b/vars/Bilimbi.yml @@ -1,6 +1,8 @@ --- -deploy_public_key: files/id_ed25519_Embrevade.pub +# deploy_public_key: files/id_ed25519_Embrevade.pub +deploy_public_key: files/id_ed25519_home.pub minimal: true +server: true diff --git a/vars/common.yml b/vars/common.yml index c65ec63..c447026 100644 --- a/vars/common.yml +++ b/vars/common.yml @@ -7,5 +7,6 @@ deploy_users: - { username: 'waha', password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1', uid: '999'} minimal: false +server: false deploy_public_key: files/id_ed25519_embrevade.pub