Skip to content

Commit

Permalink
rework nginx
Browse files Browse the repository at this point in the history
  • Loading branch information
Tommi committed Aug 10, 2024
1 parent 95b50be commit ffb963a
Show file tree
Hide file tree
Showing 42 changed files with 815 additions and 301 deletions.
2 changes: 1 addition & 1 deletion bkk06
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ kppl26
wppl26
rpc-asset-hub-paseo-01
rpc-people-polkadot-01
rpc-bridgehub-paseo-01
rpc-bridge-hub-paseo-01

[encointer]
enc14
Expand Down
2 changes: 1 addition & 1 deletion bkk07
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ kppl27
wppl27
rpc-asset-hub-paseo-02
rpc-people-polkadot-02
rpc-bridgehub-paseo-02
rpc-bridge-hub-paseo-02

[services]
monitor
Expand Down
215 changes: 161 additions & 54 deletions host_vars/bkk06.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1305,75 +1305,40 @@ lxc_nodes:
- from_port: "{{ hostvars['rpc-people-polkadot-01']['default_p2p_port_wss'] }}"
to_host: "{{ hostvars['rpc-people-polkadot-01']['container_ip'] }}:{{ hostvars['rpc-people-polkadot-01']['default_p2p_port_wss'] }}"
protocol: "tcp"
- host: "rpc-bridgehub-paseo-01"
- host: "rpc-bridge-hub-paseo-01"
proxmox_config:
vmid: "340201"
hostname: "{{ hostvars['rpc-bridgehub-paseo-01']['host_name'] }}"
hostname: "{{ hostvars['rpc-bridge-hub-paseo-01']['host_name'] }}"
ostemplate: "local:vztmpl/{{ default_container_template }}"
netif: "{{ hostvars['rpc-bridgehub-paseo-01']['netif'] }}"
netif: "{{ hostvars['rpc-bridge-hub-paseo-01']['netif'] }}"
cores: 4
memory: 16384
swap: 8192
password: "{{ default_password }}"
disk: "{{ default_storage }}:20"
mounts: '{"mp0":"{{ default_storage }}:100,mp={{ hostvars["rpc-bridgehub-paseo-01"]["default_database_path"] }}"}'
mounts: '{"mp0":"{{ default_storage }}:100,mp={{ hostvars["rpc-bridge-hub-paseo-01"]["default_database_path"] }}"}'
onboot: True
unprivileged: True
validate_certs: False
description: "{{ hostvars['rpc-bridgehub-paseo-01']['default_network'] }} {{ hostvars['rpc-bridgehub-paseo-01']['default_node_type'] }}: {{ hostvars['rpc-bridgehub-paseo-01']['host_name'] }}"
description: "{{ hostvars['rpc-bridge-hub-paseo-01']['default_network'] }} {{ hostvars['rpc-bridge-hub-paseo-01']['default_node_type'] }}: {{ hostvars['rpc-bridge-hub-paseo-01']['host_name'] }}"
state: present
features:
- nesting=1
port_forwards:
- from_port: "{{ hostvars['rpc-bridgehub-paseo-01']['ansible_port'] }}"
to_host: "{{ hostvars['rpc-bridgehub-paseo-01']['container_ip'] }}:22"
- from_port: "{{ hostvars['rpc-bridge-hub-paseo-01']['ansible_port'] }}"
to_host: "{{ hostvars['rpc-bridge-hub-paseo-01']['container_ip'] }}:22"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-bridgehub-paseo-01']['zabbix_ext_port'] }}"
- from_port: "{{ hostvars['rpc-bridge-hub-paseo-01']['zabbix_ext_port'] }}"
to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-bridgehub-paseo-01']['default_p2p_port'] }}"
to_host: "{{ hostvars['rpc-bridgehub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-bridgehub-paseo-01']['default_p2p_port'] }}"
- from_port: "{{ hostvars['rpc-bridge-hub-paseo-01']['default_p2p_port'] }}"
to_host: "{{ hostvars['rpc-bridge-hub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-bridge-hub-paseo-01']['default_p2p_port'] }}"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-bridgehub-paseo-01']['default_p2p_port_ws'] }}"
to_host: "{{ hostvars['rpc-bridgehub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-bridgehub-paseo-01']['default_p2p_port_ws'] }}"
- from_port: "{{ hostvars['rpc-bridge-hub-paseo-01']['default_p2p_port_ws'] }}"
to_host: "{{ hostvars['rpc-bridge-hub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-bridge-hub-paseo-01']['default_p2p_port_ws'] }}"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-bridgehub-paseo-01']['default_p2p_port_wss'] }}"
to_host: "{{ hostvars['rpc-bridgehub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-bridgehub-paseo-01']['default_p2p_port_wss'] }}"
protocol: "tcp"
- host: "boot-asset-hub-paseo"
proxmox_config:
vmid: "240101"
hostname: "{{ hostvars['boot-asset-hub-paseo']['host_name'] }}"
ostemplate: "local:vztmpl/{{ default_container_template }}"
netif: "{{ hostvars['boot-asset-hub-paseo']['netif'] }}"
cores: 2
memory: 16384
swap: 8192
password: "{{ default_password }}"
disk: "{{ default_storage }}:20"
mounts: '{"mp0":"{{ default_storage }}:100,mp={{ hostvars["boot-asset-hub-paseo"]["default_database_path"] }}"}'
onboot: True
unprivileged: True
validate_certs: False
description: "{{ hostvars['boot-asset-hub-paseo']['default_network'] }} {{ hostvars['boot-asset-hub-paseo']['default_node_type'] }}: {{ hostvars['boot-asset-hub-paseo']['host_name'] }}"
state: present
features:
- nesting=1
port_forwards:
- from_port: "{{ hostvars['boot-asset-hub-paseo']['ansible_port'] }}"
to_host: "{{ hostvars['boot-asset-hub-paseo']['container_ip'] }}:22"
protocol: "tcp"
- from_port: "{{ hostvars['boot-asset-hub-paseo']['zabbix_ext_port'] }}"
to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
protocol: "tcp"
- from_port: "{{ hostvars['boot-asset-hub-paseo']['default_p2p_port'] }}"
to_host: "{{ hostvars['boot-asset-hub-paseo']['container_ip'] }}:{{ hostvars['boot-asset-hub-paseo']['default_p2p_port'] }}"
protocol: "tcp"
- from_port: "{{ hostvars['boot-asset-hub-paseo']['default_p2p_port_ws'] }}"
to_host: "{{ hostvars['boot-asset-hub-paseo']['container_ip'] }}:{{ hostvars['boot-asset-hub-paseo']['default_p2p_port_ws'] }}"
protocol: "tcp"
- from_port: "{{ hostvars['boot-asset-hub-paseo']['default_p2p_port_wss'] }}"
to_host: "{{ hostvars['boot-asset-hub-paseo']['container_ip'] }}:{{ hostvars['boot-asset-hub-paseo']['default_p2p_port_wss'] }}"
- from_port: "{{ hostvars['rpc-bridge-hub-paseo-01']['default_p2p_port_wss'] }}"
to_host: "{{ hostvars['rpc-bridge-hub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-bridge-hub-paseo-01']['default_p2p_port_wss'] }}"
protocol: "tcp"
- host: "rpc-asset-hub-paseo-01"
proxmox_config:
Expand All @@ -1390,7 +1355,7 @@ lxc_nodes:
onboot: True
unprivileged: True
validate_certs: False
description: "{{ hostvars['rpc-asset-hub-paseo-01']['default_network'] }} {{ hostvars['wcore26']['default_node_type'] }}: {{ hostvars['wcore26']['host_name'] }}"
description: "{{ hostvars['rpc-asset-hub-paseo-01']['default_network'] }} {{ hostvars['rpc-asset-hub-paseo-01']['default_node_type'] }}: {{ hostvars['rpc-asset-hub-paseo-01']['host_name'] }}"
state: present
features:
- nesting=1
Expand All @@ -1402,11 +1367,153 @@ lxc_nodes:
to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-asset-hub-paseo-01']['default_p2p_port'] }}"
to_host: "{{ hostvars['rpc-asset-hub-paseo-01']['container_ip'] }}:{{ hostvars['wcore26']['default_p2p_port'] }}"
to_host: "{{ hostvars['rpc-asset-hub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-asset-hub-paseo-01']['default_p2p_port'] }}"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-asset-hub-paseo-01']['default_p2p_port_ws'] }}"
to_host: "{{ hostvars['rpc-asset-hub-paseo-01']['container_ip'] }}:{{ hostvars['wcore26']['default_p2p_port_ws'] }}"
to_host: "{{ hostvars['rpc-asset-hub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-asset-hub-paseo-01']['default_p2p_port_ws'] }}"
protocol: "tcp"
- from_port: "{{ hostvars['rpc-asset-hub-paseo-01']['default_p2p_port_wss'] }}"
to_host: "{{ hostvars['rpc-asset-hub-paseo-01']['container_ip'] }}:{{ hostvars['wcore26']['default_p2p_port_wss'] }}"
protocol: "tcp"
to_host: "{{ hostvars['rpc-asset-hub-paseo-01']['container_ip'] }}:{{ hostvars['rpc-asset-hub-paseo-01']['default_p2p_port_wss'] }}"
protocol: "tcp"
#
# TODO: new relays
# - host: "rpc-polkadot-01"
# proxmox_config:
# vmid: "310001"
# hostname: "{{ hostvars['rpc-polkadot-01']['host_name'] }}"
# ostemplate: "local:vztmpl/{{ default_container_template }}"
# netif: "{{ hostvars['rpc-polkadot-01']['netif'] }}"
# cores: 4
# memory: 16384
# swap: 8192
# password: "{{ default_password }}"
# disk: "{{ zfs_storage }}:20"
# mounts: '{"mp0":"{{ zfs_storage }}:2000,mp={{ hostvars["rpc-polkadot-01"]["default_database_path"] }}"}'
# onboot: True
# unprivileged: True
# validate_certs: False
# description: "{{ hostvars['rpc-polkadot-01']['default_network'] }} {{ hostvars['rpc-polkadot-01']['default_node_type'] }}: {{ hostvars['rpc-polkadot-01']['host_name'] }}"
# state: present
# features:
# - nesting=1
# port_forwards:
# - from_port: "{{ hostvars['rpc-polkadot-01']['ansible_port'] }}"
# to_host: "{{ hostvars['rpc-polkadot-01']['container_ip'] }}:22"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-polkadot-01']['zabbix_ext_port'] }}"
# to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-polkadot-01']['default_p2p_port'] }}"
# to_host: "{{ hostvars['rpc-polkadot-01']['container_ip'] }}:{{ hostvars['rpc-polkadot-01']['default_p2p_port'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-polkadot-01']['default_p2p_port_ws'] }}"
# to_host: "{{ hostvars['rpc-polkadot-01']['container_ip'] }}:{{ hostvars['rpc-polkadot-01']['default_p2p_port_ws'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-polkadot-01']['default_p2p_port_wss'] }}"
# to_host: "{{ hostvars['rpc-polkadot-01']['container_ip'] }}:{{ hostvars['rpc-polkadot-01']['default_p2p_port_wss'] }}"
# protocol: "tcp"
# - host: "rpc-kusama-01"
# proxmox_config:
# vmid: "320001"
# hostname: "{{ hostvars['rpc-kusama-01']['host_name'] }}"
# ostemplate: "local:vztmpl/{{ default_container_template }}"
# netif: "{{ hostvars['rpc-kusama-01']['netif'] }}"
# cores: 4
# memory: 16384
# swap: 8192
# password: "{{ default_password }}"
# disk: "{{ zfs_storage }}:20"
# mounts: '{"mp0":"{{ zfs_storage }}:2000,mp={{ hostvars["rpc-kusama-01"]["default_database_path"] }}"}'
# onboot: True
# unprivileged: True
# validate_certs: False
# description: "{{ hostvars['rpc-kusama-01']['default_network'] }} {{ hostvars['rpc-kusama-01']['default_node_type'] }}: {{ hostvars['rpc-kusama-01']['host_name'] }}"
# state: present
# features:
# - nesting=1
# port_forwards:
# - from_port: "{{ hostvars['rpc-kusama-01']['ansible_port'] }}"
# to_host: "{{ hostvars['rpc-kusama-01']['container_ip'] }}:22"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-kusama-01']['zabbix_ext_port'] }}"
# to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-kusama-01']['default_p2p_port'] }}"
# to_host: "{{ hostvars['rpc-kusama-01']['container_ip'] }}:{{ hostvars['rpc-kusama-01']['default_p2p_port'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-kusama-01']['default_p2p_port_ws'] }}"
# to_host: "{{ hostvars['rpc-kusama-01']['container_ip'] }}:{{ hostvars['rpc-kusama-01']['default_p2p_port_ws'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-kusama-01']['default_p2p_port_wss'] }}"
# to_host: "{{ hostvars['rpc-kusama-01']['container_ip'] }}:{{ hostvars['rpc-kusama-01']['default_p2p_port_wss'] }}"
# protocol: "tcp"
# - host: "rpc-westend-01"
# proxmox_config:
# vmid: "330001"
# hostname: "{{ hostvars['rpc-westend-01']['host_name'] }}"
# ostemplate: "local:vztmpl/{{ default_container_template }}"
# netif: "{{ hostvars['rpc-westend-01']['netif'] }}"
# cores: 4
# memory: 16384
# swap: 8192
# password: "{{ default_password }}"
# disk: "{{ zfs_storage }}:20"
# mounts: '{"mp0":"{{ zfs_storage }}:2000,mp={{ hostvars["rpc-westend-01"]["default_database_path"] }}"}'
# onboot: True
# unprivileged: True
# validate_certs: False
# description: "{{ hostvars['rpc-westend-01']['default_network'] }} {{ hostvars['rpc-westend-01']['default_node_type'] }}: {{ hostvars['rpc-westend-01']['host_name'] }}"
# state: present
# features:
# - nesting=1
# port_forwards:
# - from_port: "{{ hostvars['rpc-westend-01']['ansible_port'] }}"
# to_host: "{{ hostvars['rpc-westend-01']['container_ip'] }}:22"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-westend-01']['zabbix_ext_port'] }}"
# to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-westend-01']['default_p2p_port'] }}"
# to_host: "{{ hostvars['rpc-westend-01']['container_ip'] }}:{{ hostvars['rpc-westend-01']['default_p2p_port'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-westend-01']['default_p2p_port_ws'] }}"
# to_host: "{{ hostvars['rpc-westend-01']['container_ip'] }}:{{ hostvars['rpc-westend-01']['default_p2p_port_ws'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-westend-01']['default_p2p_port_wss'] }}"
# to_host: "{{ hostvars['rpc-westend-01']['container_ip'] }}:{{ hostvars['rpc-westend-01']['default_p2p_port_wss'] }}"
# protocol: "tcp"
# - host: "rpc-paseo-01"
# proxmox_config:
# vmid: "340001"
# hostname: "{{ hostvars['rpc-paseo-01']['host_name'] }}"
# ostemplate: "local:vztmpl/{{ default_container_template }}"
# netif: "{{ hostvars['rpc-paseo-01']['netif'] }}"
# cores: 4
# memory: 16384
# swap: 8192
# password: "{{ default_password }}"
# disk: "{{ zfs_storage }}:20"
# mounts: '{"mp0":"{{ zfs_storage }}:2000,mp={{ hostvars["rpc-paseo-01"]["default_database_path"] }}"}'
# onboot: True
# unprivileged: True
# validate_certs: False
# description: "{{ hostvars['rpc-paseo-01']['default_network'] }} {{ hostvars['rpc-paseo-01']['default_node_type'] }}: {{ hostvars['rpc-paseo-01']['host_name'] }}"
# state: present
# features:
# - nesting=1
# port_forwards:
# - from_port: "{{ hostvars['rpc-paseo-01']['ansible_port'] }}"
# to_host: "{{ hostvars['rpc-paseo-01']['container_ip'] }}:22"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-paseo-01']['zabbix_ext_port'] }}"
# to_host: "{{ hostvars['monitor']['container_ip'] }}:10050"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-paseo-01']['default_p2p_port'] }}"
# to_host: "{{ hostvars['rpc-paseo-01']['container_ip'] }}:{{ hostvars['rpc-paseo-01']['default_p2p_port'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-paseo-01']['default_p2p_port_ws'] }}"
# to_host: "{{ hostvars['rpc-paseo-01']['container_ip'] }}:{{ hostvars['rpc-paseo-01']['default_p2p_port_ws'] }}"
# protocol: "tcp"
# - from_port: "{{ hostvars['rpc-paseo-01']['default_p2p_port_wss'] }}"
# to_host: "{{ hostvars['rpc-paseo-01']['container_ip'] }}:{{ hostvars['rpc-paseo-01']['default_p2p_port_wss'] }}"
# protocol: "tcp"
Loading

0 comments on commit ffb963a

Please sign in to comment.