From 6191f4c44496762c821fbfe8400e5b5a27817a3b Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:40:38 +0000 Subject: [PATCH 1/7] adding ansible pipx requirements --- ansible-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ansible-requirements.txt diff --git a/ansible-requirements.txt b/ansible-requirements.txt new file mode 100644 index 0000000..06c91c3 --- /dev/null +++ b/ansible-requirements.txt @@ -0,0 +1,2 @@ +pipx inject ansible passlib +pipx inject ansible docker From e1f1e974a3eb471044bb48cc8dea7ac068b22d3c Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:40:58 +0000 Subject: [PATCH 2/7] adding ansible to pipx installation --- group_vars/all/python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/all/python.yml b/group_vars/all/python.yml index d2b0509..75adb0c 100644 --- a/group_vars/all/python.yml +++ b/group_vars/all/python.yml @@ -2,3 +2,4 @@ install_pyenv_python: true pyenv_python_version: 3.9.1 pipx_packages: - awscli + - ansible From c5fa6ffda9f9457bfa9229c61b54726837fb7ea5 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:41:12 +0000 Subject: [PATCH 3/7] updating requirements.yml --- requirements.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/requirements.yml b/requirements.yml index 7911227..1e7faf1 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,14 +1,20 @@ --- +# roles # linux -- src: jnv.debian-backports -- src: jnv.unattended-upgrades -- src: nickjj.docker -- src: nickjj.fail2ban +roles: + - src: jnv.debian-backports + - src: jnv.unattended-upgrades + - src: nickjj.docker + - src: nickjj.fail2ban -# mac -- src: elliotweiser.osx-command-line-tools -- src: geerlingguy.homebrew + # mac + - src: elliotweiser.osx-command-line-tools + - src: geerlingguy.homebrew -# misc -- src: fubarhouse.golang -... + # misc + - src: fubarhouse.golang + +# collections +# linux +collections: + - community.docker From a27f3b2e7a8fa3c667e5c541987dc7e34cafca6d Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:41:21 +0000 Subject: [PATCH 4/7] adding nginx demo to docker setup role --- roles/docker/tasks/main.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 2bf7f88..0fa41b9 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -6,7 +6,7 @@ include_role: name: nickjj.docker - - name: Ensure group "docker" exists + - name: Ensure group "docker" existcs group: name: docker state: present @@ -32,3 +32,19 @@ owner: root group: root mode: u=rw,g=r,o=r + +- name: Run a demo Nginx container + tags: [docker] + block: + - name: Install Docker Python SDK + pip: + name: docker + + - name: Run nginxdemos/nginx-hello + community.docker.docker_container: + name: nginx-hello + image: nginxdemos/nginx-hello + state: started + restart: yes + ports: + - 8080:8080 From d6cc9d91ccfc931d7a0e17501d03c946f4a5a9b5 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:41:34 +0000 Subject: [PATCH 5/7] adding --force-deps to pipx install command --- roles/python/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index c0c78d4..8a9198d 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -22,7 +22,7 @@ creates: "{{ default_user_home }}/.local/bin/pipx" - name: Install pipx packages - shell: "{{ default_user_home }}/.local/bin/pipx install {{ item }} --force" + shell: "{{ default_user_home }}/.local/bin/pipx install {{ item }} --force --include-deps" loop: "{{ pipx_packages }}" - name: Install Poetry From ca33a4b0b69b65dd7169b1341561652070771c8e Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:41:40 +0000 Subject: [PATCH 6/7] removing always tag --- roles/shell/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml index bd5e7e4..a97fbe2 100644 --- a/roles/shell/tasks/main.yml +++ b/roles/shell/tasks/main.yml @@ -36,7 +36,6 @@ suffix: .tmp register: temp_install_dir changed_when: false - tags: always - name: Download oh-my-zsh get_url: From 98af384bf2077ed4072a9aa1c1d6f2ef3b16d48f Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 7 Mar 2021 15:41:50 +0000 Subject: [PATCH 7/7] updating README.md for mac/linux flags --- README.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a5e51c6..78c823b 100644 --- a/README.md +++ b/README.md @@ -1 +1,18 @@ -ansible_linux_setup +# ansible_linux_setup + +## Linux server setup + +### `provision.yml` + +- Set `hosts` to `all` +- Set `target_system` to `linux` + +## Mac setup + +### `provision.yml` + +- Set `hosts` to `127.0.0.1` +- Set `connection` to `local` +- Set `default_user` to Mac user +- Set `default_user_group` to Mac user's group +- Set `ansible_become_pass` to users password for sudo