diff --git a/roles/create_user/defaults/main.yml b/roles/create_user/defaults/main.yml index d7ead5c..e1be6a2 100644 --- a/roles/create_user/defaults/main.yml +++ b/roles/create_user/defaults/main.yml @@ -2,5 +2,7 @@ # defaults file for create_user primary_group: "{{ user }}" secondary_groups: '' +password: '' shell: "/bin/bash" home: "/home/{{ user }}" +create_home: "{{ 'false' if (home == '/nonexistent') else 'true'}}" \ No newline at end of file diff --git a/roles/create_user/tasks/main.yml b/roles/create_user/tasks/main.yml index 39b89c6..fa1998c 100644 --- a/roles/create_user/tasks/main.yml +++ b/roles/create_user/tasks/main.yml @@ -3,6 +3,7 @@ - name: Adding group ansible.builtin.group: name: "{{ primary_group }}" + gid: "{{ gid }}" state: present - name: Adding user @@ -14,6 +15,7 @@ groups: "{{ secondary_groups }}" home: "{{ home }}" password: "{{ password }}" + create_home: "{{ create_home }}" - name: Dowload ssh key ansible.builtin.uri: diff --git a/roles/docker_spin_up/defaults/main.yml b/roles/docker_spin_up/defaults/main.yml index 7cde2d3..1935337 100644 --- a/roles/docker_spin_up/defaults/main.yml +++ b/roles/docker_spin_up/defaults/main.yml @@ -1,2 +1,3 @@ --- # defaults file for docker_spin_up +docker_homepath: "/{{ zfs_pool_name }}/{{ docker_name }}" diff --git a/roles/docker_spin_up/tasks/main.yml b/roles/docker_spin_up/tasks/main.yml index d746b4b..0c16ea8 100644 --- a/roles/docker_spin_up/tasks/main.yml +++ b/roles/docker_spin_up/tasks/main.yml @@ -8,6 +8,10 @@ # group: root # mode: '0644' -- name: Spin up "{{ docker_name }}" +- name: Create a network + community.docker.docker_network: + name: http + +- name: Spin up {{ docker_compose_file }} ansible.builtin.include_tasks: "{{ docker_compose_file }}" \ No newline at end of file diff --git a/roles/docker_spin_up/tasks/transmission.yaml b/roles/docker_spin_up/tasks/transmission.yaml index 5865913..6ca1487 100644 --- a/roles/docker_spin_up/tasks/transmission.yaml +++ b/roles/docker_spin_up/tasks/transmission.yaml @@ -15,10 +15,10 @@ # - /path/to/data:/config - "{{ docker_homepath }}/downloads:/downloads" - "{{ docker_homepath }}/watch:/watch" - ports: - - 9091:9091 - - 51413:51413 - - 51413:51413/udp + #ports: + # - 9091:9091 + # - 51413:51413 + # - 51413:51413/udp restart_policy: unless-stopped - #networks: - # - name: global \ No newline at end of file + networks: + - name: http diff --git a/roles/tools_for_command_line/tasks/administration.yml b/roles/tools_for_command_line/tasks/administration.yml index 3ba48fb..dfe97d7 100644 --- a/roles/tools_for_command_line/tasks/administration.yml +++ b/roles/tools_for_command_line/tasks/administration.yml @@ -20,6 +20,7 @@ - screen - python3 - python3-pip + - mycli state: present - name: Wireguard deb diff --git a/zeus.yml b/zeus.yml index 95461d5..a8b3bf3 100644 --- a/zeus.yml +++ b/zeus.yml @@ -15,14 +15,14 @@ # samba_ip: "{{ ip }}/32" # docker_users: "{{ user }}" # roles: -# - role: create_user -# - role: linux_config_init -# - role: tools_for_command_line -# - role: ansible-role-security -# - role: zfs_install -# - role: nfs_install -# - role: samba_install -# - role: ansible-role-docker +# #- role: create_user +# #- role: linux_config_init +# #- role: tools_for_command_line +# #- role: ansible-role-security +# #- role: zfs_install +# #- role: nfs_install +# #- role: samba_install +# #- role: ansible-role-docker #- name: Zfs dataset + Samba - Tata @@ -30,6 +30,7 @@ # become: true # vars_files: # - vault.yml +# - zeus-vars.yml # vars: # user: tata # primary_group: nogroup @@ -37,7 +38,6 @@ # password: "{{ tata_password }}" # home: /bigpool/tata # shell: "/bin/false" -# zfs_pool_name: bigpool # zfs_dataset_name: "{{ user }}" # zfs_dataset_user: "{{ user }}" # zfs_dataset_group: "{{ primary_group }}" @@ -50,30 +50,108 @@ # - role: create_user # - role: create_zfs_dataset # - role: create_samba_user - # smbpasswd -a tata - + # smbpasswd -a tata -#- name: Torrent client spawn + +#- name: MariaDB start # hosts: zeus-public # become: true # vars_files: -# - vault.yml +# - zeus-vars.yml # vars: -# user: warezjoe -# uid: "1000" -# password: "{{ warezjoe_password_un }}" -# docker_name: transmission -# docker_compose_file: transmission.yaml -# zfs_pool_name: bigpool -# zfs_dataset_name: "{{ docker_name }}" +# user: mysql +# primary_group: mysql +# uid: 110 +# gid: 114 +# shell: "/bin/false" +# home: "/nonexistent" +# zfs_dataset_name: MariaDB # zfs_dataset_user: "{{ user }}" -# zfs_dataset_group: "{{ user }}" -# zfs_dataset_size: 1T -# docker_homepath: "/{{ zfs_pool_name }}/{{ docker_name }}" +# zfs_dataset_group: "{{ primary_group }}" +# zfs_dataset_size: 1G +# mariadb_location: "/{{ zfs_pool_name }}/{{ zfs_dataset_name }}" # # roles: -# - role: create_zfs_dataset -# - role: docker_spin_up +# #- role: create_user +# #- role: create_zfs_dataset +# - role: mariaDB_install + +- name: nginx + hosts: zeus-public + become: true + vars_files: + - zeus-vars.yml + vars: + docker_name: nginx + zfs_dataset_name: "{{ docker_name }}" + zfs_dataset_user: root + zfs_dataset_group: root + zfs_dataset_size: 100M + docker_compose_file: nginx.yml + roles: + - role: create_zfs_dataset + - role: docker_spin_up + + +#- name: email +# hosts: zeus-public +# become: true +# vars_files: +# - zeus-vars.yml +# vars: +# zfs_dataset_name: email +# zfs_dataset_user: root +# zfs_dataset_group: root +# zfs_dataset_size: 1G +# docker_compose_file: email.yml +# roles: +# - role: create_zfs_dataset +# - role: docker_spin_up + + + + + +- name: Torrent client spawn + hosts: zeus-public + become: true + vars_files: + - vault.yml + - zeus-vars.yml + vars: + user: warezjoe + uid: "1000" + password: "{{ warezjoe_password_un }}" + docker_name: transmission + docker_compose_file: transmission.yaml + zfs_dataset_name: "{{ docker_name }}" + zfs_dataset_user: "{{ user }}" + zfs_dataset_group: "{{ user }}" + zfs_dataset_size: 1T + + roles: + - role: create_zfs_dataset + - role: docker_spin_up + + +- name: Pi-hole + hosts: zeus-public + become: true + vars_files: + - vault.yml + - zeus-vars.yml + vars: + docker_name: pi-hole + zfs_dataset_name: "{{ docker_name }}" + zfs_dataset_user: root + zfs_dataset_group: root + zfs_dataset_size: 100M + docker_compose_file: pi-hole.yml + roles: + - role: create_zfs_dataset + - role: docker_spin_up + +