Skip to content

Commit

Permalink
Split the analyst
Browse files Browse the repository at this point in the history
This is needed because of the replication password, alternative would be
to do the same split as for online and not have so many groups in groups
but that also makes that we duplicate a lot of settings.
  • Loading branch information
vmcj committed Sep 10, 2024
1 parent 65a0969 commit 7730200
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 52 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Server VLAN IP prefix.
SERVER_IP_PREFIX: 172.29.1

# URL and IP of domserver from judgehosts. A hostname 'domserver' with
# DOMSERVER_IP will be added to the judgehost /etc/hosts file.
DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.240"

WF_GREEN: true

# Static IP address configuration. Uses the ansible_host variable as the static
# IP address. Only configured if STATIC_IP_ENABLED is true.
STATIC_IP_ENABLED: false
STATIC_IP_NETMASK: 255.255.252.0
STATIC_IP_GATEWAY: 172.29.0.1
STATIC_IP_INTERFACE: enp1s0

# Additional entries for the /etc/hosts file.
HOSTS:
cds: 172.29.1.207
packages: 172.29.1.209
ntp1: 172.29.1.208
ntp2: 172.29.1.209
nisprint: 172.29.1.211
nismaster: 172.29.1.211
printsrv: 172.29.1.211

GRAFANA_MONITORING: false

# Password for the MySQL replication user.
# Set this to enable master-master replication between two domservers.
#REPLICATION_PASSWORD: {some-strong-replication-password}

# Database user password.
DB_PASSWORD: {some-strong-database-password}

# Credentials for the judgehost.
JUDGEHOST_PASSWORD: {some-strong-judgehost-password}
47 changes: 0 additions & 47 deletions provision-contest/ansible/group_vars/onprem/secret.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
# Adding `strong` in the template will create longer passwords and is used for the
# passwords which almost never need to be manually typed.

# Password for the MySQL replication user.
# Set this to enable master-master replication between two domservers.
#REPLICATION_PASSWORD: {some-strong-replication-password}

# Database user password.
DB_PASSWORD: {some-strong-database-password}

Expand All @@ -24,48 +20,5 @@ ADMIN_PASSWORD: {some-admin-password}
# created on the domserver and judgehosts.
#DJ_SHELL_USER_PW: {some-hashed-password}

# Accounts to create when setting up the CDS
CDS_ACCOUNTS:
- username: admin
password: {some-adm1n-password}
type: admin
- username: presAdmin
password: {some-presentation-adm1n-password}
type: admin
- username: presentation
password: {some-public-presentation-password}
type: public
#- username: blue
# password: blu3
# type: staff
#- username: balloon
# password: balloonPr1nter
# type: balloon
#- username: public
# password: publ1c
# type: public
#- username: myicpc
# password: my1cpc
# type: spectator
#- username: live
# password: l1ve
# type: analyst
#- username: team1
# password: t3am
# type: team
# team_id: 1

# Contest(s) to configure in the CDS
CDS_CONTESTS:
- path: nwerc18 # Path in the contest directory
ccs:
id: nwerc18 # ID of the contest if hosted at DOMJUDGE_URL
# Or provide a absolute URL
# url: https://www.domjudge.org/demoweb/api/contests/nwerc18
username: admin
password: admin

PRESCLIENT_CONTEST: nwerc18

# Sentry DSN URL
# SENTRY_DSN:
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Password for the MySQL replication user.
# Set this to enable master-master replication between two domservers.
REPLICATION_PASSWORD: {some-strong-replication-password}
16 changes: 11 additions & 5 deletions provision-contest/ansible/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ admin
online-domserver
online-judgehost

[domserver]
[domserver:children]
wfinal-domserver
analyst-domserver

[wfinal-domserver]
# Set EFI_ORDER onsite for faster boot
#EFI_ORDER='0\,1\,3\,4'
domjudge-primary ansible_host=10.3.3.216 KEEPALIVED_PRIORITY=100
domjudge-backup ansible_host=10.3.3.217 KEEPALIVED_PRIORITY=99
# Discuss if we can have this host dualhomed in blue to make management easier.\
# Looking at the IP sheet that would mean that our emergency laptop needs to move.
domjudge-analyst ansible_host=172.29.1.240

[domserver:children]
[wfinal-domserver:children]
emergency

[emergency]
Expand Down Expand Up @@ -62,6 +63,11 @@ domjudge-ccsadmin5 ansible_host=10.3.3.227
# Doesn't matter which (admin) machine but should not be 1 as that runs ansible
domjudge-ccsadmin2 ansible_host=10.3.3.225

[analyst-domserver]
# Discuss if we can have this host dualhomed in blue to make management easier.\
# Looking at the IP sheet that would mean that our emergency laptop needs to move.
domjudge-analyst ansible_host=172.29.1.240

[online-domserver]
online-domserver ansible_host=192.168.255.255

Expand Down

0 comments on commit 7730200

Please sign in to comment.