diff --git a/BV_boutique.yml b/BV_boutique.yml new file mode 100644 index 0000000..f881f99 --- /dev/null +++ b/BV_boutique.yml @@ -0,0 +1,24 @@ +--- +- hosts: localhost + connection: local + + vars_files: + - vars/common.yml + - vars/server.yml + - vars/BV_boutique.yml + + tasks: + - include: tasks/ansible.yml + - include: tasks/deb_CLI_packages.yml + - include: tasks/prompt.yml + - include: tasks/users.yml + - include: tasks/sudo.yml + - include: tasks/ssh.yml + - include: tasks/dotfiles.yml + - include: tasks/deb_docker.yml + + handlers: + - name: restart sshd + service: + name: sshd + state: restarted diff --git a/Choux.yml b/Choux.yml index ce768d5..4d7236a 100644 --- a/Choux.yml +++ b/Choux.yml @@ -15,7 +15,7 @@ - include: tasks/pacman_cache_server.yml - include: tasks/arch_CLI_packages.yml - include: tasks/prompt.yml - # - include: tasks/users.yml + - include: tasks/users.yml - include: tasks/sudo.yml - include: tasks/ssh.yml - include: tasks/arch_programming.yml diff --git a/files/dotfiles/sshconfig b/files/dotfiles/sshconfig index 1e89cf9..a2286d1 100755 --- a/files/dotfiles/sshconfig +++ b/files/dotfiles/sshconfig @@ -14,6 +14,16 @@ Host Embrevade identityfile ~/.ssh/id_ed25519_embrevade IdentitiesOnly yes +Host BV_boutique + HostName vps789921.ovh.net + User waha + Port 22 + ForwardAgent yes + PubkeyAcceptedKeyTypes * + identityfile ~/.ssh/id_rsa_manioc + IdentitiesOnly yes + + Host git_opytex HostName git.opytex.org User git diff --git a/tasks/deb_CLI_packages.yml b/tasks/deb_CLI_packages.yml index 49051cb..c8fb2f0 100644 --- a/tasks/deb_CLI_packages.yml +++ b/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: diff --git a/tasks/deb_docker.yml b/tasks/deb_docker.yml index a827575..7a6c407 100644 --- a/tasks/deb_docker.yml +++ b/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: diff --git a/tasks/dotfiles.yml b/tasks/dotfiles.yml index df4c724..7a3566d 100644 --- a/tasks/dotfiles.yml +++ b/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 diff --git a/tasks/users.yml b/tasks/users.yml index da0f630..8449a24 100644 --- a/tasks/users.yml +++ b/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 diff --git a/vars/BV_boutique.yml b/vars/BV_boutique.yml new file mode 100644 index 0000000..25a9b85 --- /dev/null +++ b/vars/BV_boutique.yml @@ -0,0 +1,9 @@ +--- +deploy_public_key: id_rsa_manioc.pub + +deploy_users: + - username: 'waha' + password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1' + uid: '1001' + group: wheel + groups: sudo diff --git a/vars/common.yml b/vars/common.yml index fc181d2..0ed9b2d 100644 --- a/vars/common.yml +++ b/vars/common.yml @@ -17,4 +17,5 @@ prompt: 'fish' minimal: false server: false +create_user: false