diff --git a/apt_upgrade.yaml b/apt_upgrade.yaml deleted file mode 100644 index 3dad61b..0000000 --- a/apt_upgrade.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: black_vm:black - tasks: - - apt: - update_cache: true - upgrade: 'dist' - when: ansible_distribution == 'Debian' - - apk: - available: true - upgrade: true - update_cache: true - when: ansible_distribution == 'Alpine' diff --git a/bakulilik.yaml b/host_bakulilik.yaml similarity index 100% rename from bakulilik.yaml rename to host_bakulilik.yaml diff --git a/blogs.yaml b/host_blogs.yaml similarity index 100% rename from blogs.yaml rename to host_blogs.yaml diff --git a/ca.yaml b/host_ca.yaml similarity index 100% rename from ca.yaml rename to host_ca.yaml diff --git a/firewall.yaml b/host_gandalf.yaml similarity index 90% rename from firewall.yaml rename to host_gandalf.yaml index e48b60f..737d918 100644 --- a/firewall.yaml +++ b/host_gandalf.yaml @@ -8,7 +8,7 @@ - role: 'ssh_server' ansible_distribution: 'openwrt' -- hosts: 'status' +- hosts: 'monitoring_hosts' roles: - role: 'icinga2-monitoring' ... diff --git a/ldap.yaml b/host_ldap.yaml similarity index 100% rename from ldap.yaml rename to host_ldap.yaml diff --git a/lists.yaml b/host_lists.yaml similarity index 100% rename from lists.yaml rename to host_lists.yaml diff --git a/lists2.yaml b/host_lists2.yaml similarity index 100% rename from lists2.yaml rename to host_lists2.yaml diff --git a/logger.yaml b/host_logger.yaml similarity index 100% rename from logger.yaml rename to host_logger.yaml diff --git a/host_login.yaml b/host_login.yaml new file mode 100644 index 0000000..a3a65f0 --- /dev/null +++ b/host_login.yaml @@ -0,0 +1,21 @@ +--- +- import_playbook: 'prepare_lxc_guest.yaml' + vars: + host: 'login' + vm_size: '1G' + unprivileged: true + +- hosts: 'login' + vars: + reverse_proxy_proxy_protocol: false + nginx_proxy_protocol: false + roles: + - role: 'dns_record' + - role: 'reverse_proxy' + - role: 'login-new' + - role: 'monitoring-agent' + +- hosts: 'monitoring_hosts' + roles: + - role: 'icinga2-monitoring' +... diff --git a/mail.yaml b/host_mail.yaml similarity index 100% rename from mail.yaml rename to host_mail.yaml diff --git a/matrix.yaml b/host_matrix.yaml similarity index 77% rename from matrix.yaml rename to host_matrix.yaml index 5903de4..88ff758 100644 --- a/matrix.yaml +++ b/host_matrix.yaml @@ -2,7 +2,7 @@ - import_playbook: 'prepare_lxc_guest.yaml' vars: host: 'matrix' - vm_size: '2G' + vm_size: '10G' - hosts: 'matrix' roles: @@ -10,9 +10,9 @@ - role: 'reverse_proxy' reverse_proxy_site_fqdn: - 'matrix.{{ domain }}' - - 'riot.{{ domain }}' - - role: 'coturn' - - role: 'matrix-synapse' + - 'riot.sestograd.org' + #- role: 'coturn' + #- role: 'matrix-synapse' - role: 'riot-web' - role: 'monitoring-agent' diff --git a/media.yaml b/host_media.yaml similarity index 100% rename from media.yaml rename to host_media.yaml diff --git a/nextcloud.yaml b/host_nextcloud.yaml similarity index 100% rename from nextcloud.yaml rename to host_nextcloud.yaml diff --git a/projects.yaml b/host_projects.yaml similarity index 69% rename from projects.yaml rename to host_projects.yaml index d0500c5..9e0db84 100644 --- a/projects.yaml +++ b/host_projects.yaml @@ -2,16 +2,19 @@ - import_playbook: 'prepare_lxc_guest.yaml' vars: host: 'projects' - vm_size: '4G' + vm_size: '20G' + unprivileged: true - hosts: 'projects' + vars: + reverse_proxy_proxy_protocol: false + nginx_proxy_protocol: false roles: - role: 'dns_record' - role: 'reverse_proxy' reverse_proxy_site_fqdn: - 'projects.{{ domain }}' - - 'mattermost.{{ domain }}' - - role: 'gitlab' + - role: 'gitea' - role: 'monitoring-agent' - hosts: 'monitoring_hosts' diff --git a/shadow_list.yaml b/host_shadow_list.yaml similarity index 100% rename from shadow_list.yaml rename to host_shadow_list.yaml diff --git a/status.yaml b/host_status.yaml similarity index 100% rename from status.yaml rename to host_status.yaml diff --git a/team_server.yaml b/host_team_server.yaml similarity index 100% rename from team_server.yaml rename to host_team_server.yaml diff --git a/users.yaml b/host_users.yaml similarity index 100% rename from users.yaml rename to host_users.yaml diff --git a/web_ca.yaml b/host_web_ca.yaml similarity index 100% rename from web_ca.yaml rename to host_web_ca.yaml diff --git a/webmail.yaml b/host_webmail.yaml similarity index 100% rename from webmail.yaml rename to host_webmail.yaml diff --git a/wiki.yaml b/host_wiki.yaml similarity index 100% rename from wiki.yaml rename to host_wiki.yaml diff --git a/login.yaml b/login.yaml deleted file mode 100644 index 11c9714..0000000 --- a/login.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- hosts: biff - roles: - - role: lxc_guest - vm_name: login - distro: stretch - - role: ssh_server - ansible_connection: ssh_lxc - ansible_ssh_lxc_name: login -- hosts: login - roles: - - role: dns_record - - role: reverse_proxy - hostname: login - - role: login -- hosts: status - roles: - - role: icinga2-monitoring