diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml deleted file mode 100644 index 1691d8e..0000000 --- a/inventory/group_vars/all.yml +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/ansible-playbook -# vim:ft=ansible: -ansible_pull_repo: "https://git.9iron.club/salt/ansible" -user_username: salt -zone: 9iron.club -zerotier_network_id: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 35646131343239623265663562343333383362366633386462646465643163353866643633636135 - 6238643231313536323337343663313865323430323437630a353462393830376431376363373232 - 30656433343263653035333637336165323931363966376264353164326135336131646362623734 - 3339633961393864330a616437613534643231366634643362383438316233376334636264303361 - 65313231393433396538663463383731303661633663343066333264303330313133 -gitea_api_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 39646564383934343237626436363261643265663339616566353563613266396536373164646235 - 3630333032613536373532616363333464653138656164390a386565316164386263363935663264 - 62613737336539653835356634313636643732396330313863393861373664353966363437373338 - 6565336264613334650a613063393662643237333864316332613131386233396562333063646263 - 63636238356266363065656462626536346634646365363135643538316136346566306131626161 - 3166653266383332343332366530343532396435353134373939 diff --git a/inventory/group_vars/gameservers.yml b/inventory/group_vars/gameservers.yml deleted file mode 100644 index 551cfcf..0000000 --- a/inventory/group_vars/gameservers.yml +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/ansible-playbook -# vim:ft=ansible: -backups_frequency: 6h -mcheapmax: 4096 -mcheapmin: 1024 -steam_api_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 39616163316634306633623435636633623966306537636639316439343839393231376661666335 - 6136333866633861313566306433393637613364386234360a303832626338373230396665336430 - 33346530626633616161613635656433356434366437383363663165303862316163323263323230 - 3334373531646364620a386165626130386265343235363639346230323930626330343235373662 - 38313431663734343931333462316633643935353038313934663466303834636533616165353961 - 6438356265656532396363323532616437353831613261323037 diff --git a/inventory/group_vars/home.yml b/inventory/group_vars/home.yml deleted file mode 100644 index 0a43765..0000000 --- a/inventory/group_vars/home.yml +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/ansible-playbook -# vim:ft=ansible: -ansible_pull_frequency: 8h -aws_backup_bucket: "9iron-backups-home" -backups_frequency: 1d -desktop_web_repo: "https://git.9iron.club/salt/www" diff --git a/inventory/group_vars/webservers.yml b/inventory/group_vars/webservers.yml deleted file mode 100644 index 0d75a5c..0000000 --- a/inventory/group_vars/webservers.yml +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/ansible-playbook -# vim:ft=ansible: -ssl_protocol: "all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1" -ssl_cipher_suite: "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256" diff --git a/inventory/hosts.yml b/inventory/hosts.yml index 8e5452f..fc92663 100644 --- a/inventory/hosts.yml +++ b/inventory/hosts.yml @@ -2,17 +2,42 @@ # vim:ft=ansible: all: vars: + ansible_pull_repo: "https://git.9iron.club/salt/ansible" ansible_user: ubuntu + gitea_api_token: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 39646564383934343237626436363261643265663339616566353563613266396536373164646235 + 3630333032613536373532616363333464653138656164390a386565316164386263363935663264 + 62613737336539653835356634313636643732396330313863393861373664353966363437373338 + 6565336264613334650a613063393662643237333864316332613131386233396562333063646263 + 63636238356266363065656462626536346634646365363135643538316136346566306131626161 + 3166653266383332343332366530343532396435353134373939 + ssl_protocol: "all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1" + ssl_cipher_suite: "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256" + user_username: salt children: home: vars: ansible_user: ansible + ansible_pull_frequency: 8h + aws_backup_bucket: 9iron-backups-home + backups_frequency: 1d + desktop_web_repo: "https://git.9iron.club/salt/www" + zerotier_network_id: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 35646131343239623265663562343333383362366633386462646465643163353866643633636135 + 6238643231313536323337343663313865323430323437630a353462393830376431376363373232 + 30656433343263653035333637336165323931363966376264353164326135336131646362623734 + 3339633961393864330a616437613534643231366634643362383438316233376334636264303361 + 65313231393433396538663463383731303661633663343066333264303330313133 hosts: dsk-cstm-0: ansible_host: 172.23.100.1 lap-th-e560-0: ansible_host: 172.23.100.2 9iron.club: + vars: + zone: 9iron.club children: webservers: hosts: @@ -20,7 +45,19 @@ all: web2.9iron.club: fedi1.9iron.club: gameservers: + vars: + backups_frequency: 6h + steam_api_key: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 39616163316634306633623435636633623966306537636639316439343839393231376661666335 + 6136333866633861313566306433393637613364386234360a303832626338373230396665336430 + 33346530626633616161613635656433356434366437383363663165303862316163323263323230 + 3334373531646364620a386165626130386265343235363639346230323930626330343235373662 + 38313431663734343931333462316633643935353038313934663466303834636533616165353961 + 6438356265656532396363323532616437353831613261323037 hosts: game1.9iron.club: - cowfee.club: + cowfee.moe: + vars: + zone: cowfee.moe children: diff --git a/roles/minecraft/defaults/main.yml b/roles/minecraft/defaults/main.yml index 6c2b0bd..04cc59e 100644 --- a/roles/minecraft/defaults/main.yml +++ b/roles/minecraft/defaults/main.yml @@ -5,6 +5,6 @@ mcmotd: "An Ansible-deployed Minecraft server" mcleveltype: "default" mcgensettings: "" mcgamemode: 0 -mcheapmax: 3072 -mcheapmin: 512 +mcheapmax: 4096 +mcheapmin: 1024 mcviewdist: 12