Merge branch 'master' of git_opytex:/lafrite/Ansible_workstation

tasks/deb_CLI_packages.yml

@@ -6,26 +6,25 @@
 
 - name: Install base CLI packages
   apt:
-    name: "{{ item }}"
+    name:
+      - sudo
+      - wget
+      - curl
+      - zsh
+      - vim
+      - tmux
+      - ruby
+      - git
+      - tig
+      - openssh-server
+      - sshfs
+      - htop
+      - iftop
+      - iotop
+      - glances
+      - ranger
+      - rxvt-unicode-256color
     state: present
-  with_items:
-    - sudo
-    - wget
-    - curl
-    - zsh
-    - vim
-    - tmux
-    - ruby
-    - git
-    - tig
-    - openssh-server
-    - sshfs
-    - htop
-    - iftop
-    - iotop
-    - glances
-    - ranger
-    - rxvt-unicode-256color
 
 - name: Install extra CLI packages
   apt:

tasks/deb_docker.yml

@@ -1,20 +1,19 @@
 ---
 - name: Remove depot docker version
   apt: 
-    name: "{{ item }}"
+    name:
+      - docker 
+      - docker-engine
+      - docker.io
     state: absent
-  with_items:
-    - docker 
-    - docker-engine
-    - docker.io
 
-- name: Install tool to use apt with https
+- name: Install tool to use apt with https and gpg
   apt: 
-    name: "{{ item }}"
+    name:
+      - apt-transport-https
+      - ca-certificates
+      - gpg
     state: present
-  with_items:
-    - apt-transport-https
-    - ca-certificates
 
 - name: Add Docker apt key.
   apt_key:

tasks/dotfiles.yml

@@ -119,6 +119,7 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ me }}"
+  when: not server
 
 - name: Copy ssh user config
   template:
@@ -127,6 +128,7 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ deploy_users }}"
+  when: not server
 
 - name: Copy ssh user config
   template:
@@ -135,6 +137,7 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ me }}"
+  when: not server
 
 # Git config
 - name: Copy gitconfig
@@ -144,3 +147,4 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ me }}"
+  when: not server

tasks/users.yml

@@ -14,6 +14,7 @@
     shell: "{{ prompt_place['stdout'] }}"
     state: present
   with_items: "{{ deploy_users }}"
+  when: create_user
 
 - name: Add me
   user:
@@ -25,3 +26,4 @@
     shell: "{{ prompt_place['stdout'] }}"
     state: present
   with_items: "{{ me }}"
+  when: create_user