From 451bb91a9946915a3f9dfc2fa54c5bd8b920653d Mon Sep 17 00:00:00 2001 From: mg Date: Mon, 7 Jun 2021 19:34:38 +0200 Subject: [PATCH] playbooks sortiert (#109) bugfix laptop in user vars laptop von group zu host vars polybar dependencie playbboks verschoben Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/ansible/pulls/109 Co-Authored-By: mg Co-Committed-By: mg --- group_vars/all.yml | 2 ++ .../irantu.grote.lan.yml | 0 playbooks/{base => }/1_bootstrap.yml | 0 playbooks/2_all.yml | 16 ++++++++++++++++ playbooks/{service => 3_service}/acng.yml | 0 playbooks/{service => 3_service}/ansible.yml | 0 playbooks/{service => 3_service}/docker.yml | 0 playbooks/{service => 3_service}/dokuwiki.yml | 0 .../{service => 3_service}/fileserver.yml | 0 playbooks/{service => 3_service}/gitea.yml | 0 playbooks/{service => 3_service}/jenkins.yml | 0 playbooks/3_service/laptop.yml | 5 +++++ .../{service => 3_service}/ntp_server.yml | 0 playbooks/{service => 3_service}/pihole.yml | 0 playbooks/{service => 3_service}/proxmox.yml | 0 ...date_packages.yml => 4_update_packages.yml} | 0 playbooks/base/0_master.yml | 18 ------------------ playbooks/base/0_setup.yml | 6 ------ .../{84_apt_sources.yml => apt_sources.yml} | 0 .../base/{92_dotfiles.yml => dotfiles.yml} | 0 playbooks/base/{96_f2b.yml => f2b.yml} | 0 ...stall_packages.yml => install_packages.yml} | 0 .../base/{97_monitoring.yml => monitoring.yml} | 0 playbooks/base/{91_motd.yml => motd.yml} | 0 .../base/{87_ntp_client.yml => ntp_client.yml} | 0 playbooks/base/{93_postfix.yml => postfix.yml} | 0 playbooks/base/{88_restic.yml => restic.yml} | 0 ...5_ssh_pass_login.yml => ssh_pass_login.yml} | 0 playbooks/base/{90_tmux.yml => tmux.yml} | 0 playbooks/base/{94_ufw.yml => ufw.yml} | 0 ...ed_upgrades.yml => unattended_upgrades.yml} | 0 playbooks/base/{89_users.yml => users.yml} | 0 playbooks/base/{83_vim.yml => vim.yml} | 0 playbooks/laptop/0_master.yml | 16 ---------------- playbooks/laptop/i3.yml | 4 ---- playbooks/laptop/polybar.yml | 4 ---- roles/mgrote.polybar/tasks/main.yml | 1 + 37 files changed, 24 insertions(+), 48 deletions(-) rename group_vars/laptop.yml => host_vars/irantu.grote.lan.yml (100%) rename playbooks/{base => }/1_bootstrap.yml (100%) create mode 100644 playbooks/2_all.yml rename playbooks/{service => 3_service}/acng.yml (100%) rename playbooks/{service => 3_service}/ansible.yml (100%) rename playbooks/{service => 3_service}/docker.yml (100%) rename playbooks/{service => 3_service}/dokuwiki.yml (100%) rename playbooks/{service => 3_service}/fileserver.yml (100%) rename playbooks/{service => 3_service}/gitea.yml (100%) rename playbooks/{service => 3_service}/jenkins.yml (100%) create mode 100644 playbooks/3_service/laptop.yml rename playbooks/{service => 3_service}/ntp_server.yml (100%) rename playbooks/{service => 3_service}/pihole.yml (100%) rename playbooks/{service => 3_service}/proxmox.yml (100%) rename playbooks/{base/98_update_packages.yml => 4_update_packages.yml} (100%) delete mode 100644 playbooks/base/0_master.yml delete mode 100644 playbooks/base/0_setup.yml rename playbooks/base/{84_apt_sources.yml => apt_sources.yml} (100%) rename playbooks/base/{92_dotfiles.yml => dotfiles.yml} (100%) rename playbooks/base/{96_f2b.yml => f2b.yml} (100%) rename playbooks/base/{85_install_packages.yml => install_packages.yml} (100%) rename playbooks/base/{97_monitoring.yml => monitoring.yml} (100%) rename playbooks/base/{91_motd.yml => motd.yml} (100%) rename playbooks/base/{87_ntp_client.yml => ntp_client.yml} (100%) rename playbooks/base/{93_postfix.yml => postfix.yml} (100%) rename playbooks/base/{88_restic.yml => restic.yml} (100%) rename playbooks/base/{95_ssh_pass_login.yml => ssh_pass_login.yml} (100%) rename playbooks/base/{90_tmux.yml => tmux.yml} (100%) rename playbooks/base/{94_ufw.yml => ufw.yml} (100%) rename playbooks/base/{86_unattended_upgrades.yml => unattended_upgrades.yml} (100%) rename playbooks/base/{89_users.yml => users.yml} (100%) rename playbooks/base/{83_vim.yml => vim.yml} (100%) delete mode 100644 playbooks/laptop/0_master.yml delete mode 100644 playbooks/laptop/i3.yml delete mode 100644 playbooks/laptop/polybar.yml diff --git a/group_vars/all.yml b/group_vars/all.yml index 95705b1c..5696c27a 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -91,6 +91,7 @@ servers: - production - test + - laptop - username: root password: "{{ lookup('keepass', 'root_linux_password_hash_proxmox', 'password') }}" update_password: on_create @@ -112,6 +113,7 @@ servers: - production - test + - laptop ### mgrote.apt_install_packages programs_common: - locales diff --git a/group_vars/laptop.yml b/host_vars/irantu.grote.lan.yml similarity index 100% rename from group_vars/laptop.yml rename to host_vars/irantu.grote.lan.yml diff --git a/playbooks/base/1_bootstrap.yml b/playbooks/1_bootstrap.yml similarity index 100% rename from playbooks/base/1_bootstrap.yml rename to playbooks/1_bootstrap.yml diff --git a/playbooks/2_all.yml b/playbooks/2_all.yml new file mode 100644 index 00000000..cfe023c7 --- /dev/null +++ b/playbooks/2_all.yml @@ -0,0 +1,16 @@ +--- + - import_playbook: base/apt_sources.yml + - import_playbook: base/install_packages.yml + - import_playbook: base/unattended_upgrades.yml + - import_playbook: base/ntp_client.yml + - import_playbook: base/restic.yml + - import_playbook: base/users.yml + - import_playbook: base/tmux.yml + - import_playbook: base/motd.yml + - import_playbook: base/dotfiles.yml + - import_playbook: base/vim.yml + - import_playbook: base/postfix.yml + - import_playbook: base/ufw.yml + - import_playbook: base/ssh_pass_login.yml + - import_playbook: base/f2b.yml + - import_playbook: base/monitoring.yml diff --git a/playbooks/service/acng.yml b/playbooks/3_service/acng.yml similarity index 100% rename from playbooks/service/acng.yml rename to playbooks/3_service/acng.yml diff --git a/playbooks/service/ansible.yml b/playbooks/3_service/ansible.yml similarity index 100% rename from playbooks/service/ansible.yml rename to playbooks/3_service/ansible.yml diff --git a/playbooks/service/docker.yml b/playbooks/3_service/docker.yml similarity index 100% rename from playbooks/service/docker.yml rename to playbooks/3_service/docker.yml diff --git a/playbooks/service/dokuwiki.yml b/playbooks/3_service/dokuwiki.yml similarity index 100% rename from playbooks/service/dokuwiki.yml rename to playbooks/3_service/dokuwiki.yml diff --git a/playbooks/service/fileserver.yml b/playbooks/3_service/fileserver.yml similarity index 100% rename from playbooks/service/fileserver.yml rename to playbooks/3_service/fileserver.yml diff --git a/playbooks/service/gitea.yml b/playbooks/3_service/gitea.yml similarity index 100% rename from playbooks/service/gitea.yml rename to playbooks/3_service/gitea.yml diff --git a/playbooks/service/jenkins.yml b/playbooks/3_service/jenkins.yml similarity index 100% rename from playbooks/service/jenkins.yml rename to playbooks/3_service/jenkins.yml diff --git a/playbooks/3_service/laptop.yml b/playbooks/3_service/laptop.yml new file mode 100644 index 00000000..cc394fa5 --- /dev/null +++ b/playbooks/3_service/laptop.yml @@ -0,0 +1,5 @@ +--- +- hosts: laptop + roles: + - { role: mgrote.i3, tags: "i3", become: true } + - { role: mgrote.polybar, tags: "polybar", become: true } diff --git a/playbooks/service/ntp_server.yml b/playbooks/3_service/ntp_server.yml similarity index 100% rename from playbooks/service/ntp_server.yml rename to playbooks/3_service/ntp_server.yml diff --git a/playbooks/service/pihole.yml b/playbooks/3_service/pihole.yml similarity index 100% rename from playbooks/service/pihole.yml rename to playbooks/3_service/pihole.yml diff --git a/playbooks/service/proxmox.yml b/playbooks/3_service/proxmox.yml similarity index 100% rename from playbooks/service/proxmox.yml rename to playbooks/3_service/proxmox.yml diff --git a/playbooks/base/98_update_packages.yml b/playbooks/4_update_packages.yml similarity index 100% rename from playbooks/base/98_update_packages.yml rename to playbooks/4_update_packages.yml diff --git a/playbooks/base/0_master.yml b/playbooks/base/0_master.yml deleted file mode 100644 index 2a2517e0..00000000 --- a/playbooks/base/0_master.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- - - hosts: all - gather_facts: false - - import_playbook: 84_apt_sources.yml - - import_playbook: 85_install_packages.yml - - import_playbook: 86_unattended_upgrades.yml - - import_playbook: 87_ntp_client.yml - - import_playbook: 88_restic.yml - - import_playbook: 89_users.yml - - import_playbook: 90_tmux.yml - - import_playbook: 91_motd.yml - - import_playbook: 92_dotfiles.yml - - import_playbook: 83_vim.yml - - import_playbook: 93_postfix.yml - - import_playbook: 94_ufw.yml - - import_playbook: 95_ssh_pass_login.yml - - import_playbook: 96_f2b.yml - - import_playbook: 97_monitoring.yml diff --git a/playbooks/base/0_setup.yml b/playbooks/base/0_setup.yml deleted file mode 100644 index e7a326cd..00000000 --- a/playbooks/base/0_setup.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - - hosts: all - gather_facts: false - - import_playbook: 1_bootstrap.yml - - import_playbook: 0_master.yml - - import_playbook: 98_update_packages.yml diff --git a/playbooks/base/84_apt_sources.yml b/playbooks/base/apt_sources.yml similarity index 100% rename from playbooks/base/84_apt_sources.yml rename to playbooks/base/apt_sources.yml diff --git a/playbooks/base/92_dotfiles.yml b/playbooks/base/dotfiles.yml similarity index 100% rename from playbooks/base/92_dotfiles.yml rename to playbooks/base/dotfiles.yml diff --git a/playbooks/base/96_f2b.yml b/playbooks/base/f2b.yml similarity index 100% rename from playbooks/base/96_f2b.yml rename to playbooks/base/f2b.yml diff --git a/playbooks/base/85_install_packages.yml b/playbooks/base/install_packages.yml similarity index 100% rename from playbooks/base/85_install_packages.yml rename to playbooks/base/install_packages.yml diff --git a/playbooks/base/97_monitoring.yml b/playbooks/base/monitoring.yml similarity index 100% rename from playbooks/base/97_monitoring.yml rename to playbooks/base/monitoring.yml diff --git a/playbooks/base/91_motd.yml b/playbooks/base/motd.yml similarity index 100% rename from playbooks/base/91_motd.yml rename to playbooks/base/motd.yml diff --git a/playbooks/base/87_ntp_client.yml b/playbooks/base/ntp_client.yml similarity index 100% rename from playbooks/base/87_ntp_client.yml rename to playbooks/base/ntp_client.yml diff --git a/playbooks/base/93_postfix.yml b/playbooks/base/postfix.yml similarity index 100% rename from playbooks/base/93_postfix.yml rename to playbooks/base/postfix.yml diff --git a/playbooks/base/88_restic.yml b/playbooks/base/restic.yml similarity index 100% rename from playbooks/base/88_restic.yml rename to playbooks/base/restic.yml diff --git a/playbooks/base/95_ssh_pass_login.yml b/playbooks/base/ssh_pass_login.yml similarity index 100% rename from playbooks/base/95_ssh_pass_login.yml rename to playbooks/base/ssh_pass_login.yml diff --git a/playbooks/base/90_tmux.yml b/playbooks/base/tmux.yml similarity index 100% rename from playbooks/base/90_tmux.yml rename to playbooks/base/tmux.yml diff --git a/playbooks/base/94_ufw.yml b/playbooks/base/ufw.yml similarity index 100% rename from playbooks/base/94_ufw.yml rename to playbooks/base/ufw.yml diff --git a/playbooks/base/86_unattended_upgrades.yml b/playbooks/base/unattended_upgrades.yml similarity index 100% rename from playbooks/base/86_unattended_upgrades.yml rename to playbooks/base/unattended_upgrades.yml diff --git a/playbooks/base/89_users.yml b/playbooks/base/users.yml similarity index 100% rename from playbooks/base/89_users.yml rename to playbooks/base/users.yml diff --git a/playbooks/base/83_vim.yml b/playbooks/base/vim.yml similarity index 100% rename from playbooks/base/83_vim.yml rename to playbooks/base/vim.yml diff --git a/playbooks/laptop/0_master.yml b/playbooks/laptop/0_master.yml deleted file mode 100644 index 499397fe..00000000 --- a/playbooks/laptop/0_master.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- - - hosts: laptop - gather_facts: false - - import_playbook: ../base/85_install_packages.yml - - import_playbook: ../base/88_restic.yml - - import_playbook: ../base/89_users.yml - - import_playbook: ../base/90_tmux.yml - - import_playbook: ../base/91_motd.yml - - import_playbook: ../base/92_dotfiles.yml - - import_playbook: ../base/93_postfix.yml - - import_playbook: ../base/94_ufw.yml - - import_playbook: ../base/95_ssh_pass_login.yml - - import_playbook: ../base/96_f2b.yml - - import_playbook: ../base/83_vim.yml - - import_playbook: i3.yml - - import_playbook: polybar.yml diff --git a/playbooks/laptop/i3.yml b/playbooks/laptop/i3.yml deleted file mode 100644 index 8e2e79e3..00000000 --- a/playbooks/laptop/i3.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - - hosts: laptop - roles: - - { role: mgrote.i3, tags: "i3", become: true } diff --git a/playbooks/laptop/polybar.yml b/playbooks/laptop/polybar.yml deleted file mode 100644 index 983f748f..00000000 --- a/playbooks/laptop/polybar.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - - hosts: laptop - roles: - - { role: mgrote.polybar, tags: "polybar", become: true } diff --git a/roles/mgrote.polybar/tasks/main.yml b/roles/mgrote.polybar/tasks/main.yml index 861932cf..b5478796 100644 --- a/roles/mgrote.polybar/tasks/main.yml +++ b/roles/mgrote.polybar/tasks/main.yml @@ -4,6 +4,7 @@ ansible.builtin.package: name: - polybar + - lm-sensors state: present - name: checkout siji font