diff --git a/mysql/init.ansible.yml b/mysql/init.ansible.yml index 19763a3..9dc5869 100644 --- a/mysql/init.ansible.yml +++ b/mysql/init.ansible.yml @@ -2,5 +2,3 @@ - import_playbook: directory.ansible.yml - import_playbook: service.ansible.yml - import_playbook: secure.ansible.yml -- import_playbook: modes/gaming.ansible.yml - when: installation_type == 'gaming' diff --git a/mysql/modes/files/pterodactyl-mariadb-server.cnf.j2 b/mysql/modes/files/pterodactyl-mariadb-server.cnf.j2 deleted file mode 100644 index 874f08e..0000000 --- a/mysql/modes/files/pterodactyl-mariadb-server.cnf.j2 +++ /dev/null @@ -1,2 +0,0 @@ -[mysqld] -bind-address={{IPv4}} diff --git a/mysql/modes/gaming.ansible.yml b/mysql/modes/gaming.ansible.yml deleted file mode 100644 index 85b67de..0000000 --- a/mysql/modes/gaming.ansible.yml +++ /dev/null @@ -1,18 +0,0 @@ -- hosts: localhost - tasks: - - name: Set bind-address - template: - src: files/pterodactyl-mariadb-server.cnf.j2 - dest: /etc/my.cnf.d/pterodactyl-mariadb-server.cnf - owner: root - group: root - mode: '0644' - vars: - IPv4: "{{ansible_default_ipv4.address}}" - - name: Create pterodactyl user - mysql_user: - name: pterodactyl - password: "{{mysql_root_password}}" - host: "{{ansible_default_ipv4.address}}" - priv: '*.*:ALL,GRANT' - state: present diff --git a/network/init.ansible.yml b/network/init.ansible.yml index ae198bb..9e67a8b 100644 --- a/network/init.ansible.yml +++ b/network/init.ansible.yml @@ -1,6 +1,4 @@ - import_playbook: firewall.ansible.yml -- import_playbook: modes/gaming.ansible.yml - when: installation_type == 'gaming' - hosts: localhost tasks: @@ -10,7 +8,7 @@ dest: /etc/network/interfaces owner: root group: root - mode: '0644' + mode: "0644" - name: Enable networking service service: name: networking diff --git a/network/modes/files/firewall_pterodactyl-rules.j2 b/network/modes/files/firewall_pterodactyl-rules.j2 deleted file mode 100644 index 4200acf..0000000 --- a/network/modes/files/firewall_pterodactyl-rules.j2 +++ /dev/null @@ -1,19 +0,0 @@ -## This file is managed by Ansible -#!/usr/sbin/nft - -table inet filter { - chain input { - iifname eth0 tcp dport 8080 accept \ - comment "Accept local connection to wings" - iifname eth0 tcp dport 3306 accept \ - comment "Accept local conntection to mariadb" - } -} - -table ip nat { - chain DOCKER {} -} - -table ip filter { - chain DOCKER {} -} diff --git a/network/modes/gaming.ansible.yml b/network/modes/gaming.ansible.yml deleted file mode 100644 index 24d162c..0000000 --- a/network/modes/gaming.ansible.yml +++ /dev/null @@ -1,14 +0,0 @@ -- hosts: localhost - tasks: - - name: Install iptables for docker compatibility - package: - name: - - iptables - state: present - - name: Deploy pterodactyl nft rules - template: - src: files/firewall_pterodactyl-rules.j2 - dest: /etc/nftables.d/pterodactyl.nft - owner: root - group: root - mode: '0600' diff --git a/top.ansible.yml b/top.ansible.yml index ccd183a..8d77fdc 100644 --- a/top.ansible.yml +++ b/top.ansible.yml @@ -10,14 +10,14 @@ import_playbook: apps/init.ansible.yml - name: Setup SSH import_playbook: openssh/init.ansible.yml -- name: Setup MySQL - import_playbook: mysql/init.ansible.yml +#- name: Setup MySQL +# import_playbook: mysql/init.ansible.yml - name: Setup HAProxy import_playbook: haproxy/init.ansible.yml when: installation_type == 'proxy' - name: Setup Podman Rootless import_playbook: podman/init.ansible.yml - when: installation_type == 'build' or installation_type == 'gaming' + when: installation_type == 'build' or installation_type == 'gaming' or installation_type == 'container' - name: Setup PMS-CLI import_playbook: apps/pms-cli/init.ansible.yml when: installation_type == 'gaming'