Prefix database dumps with the instance

provision-contest/ansible/group_vars/admin.yml

@@ -8,3 +8,5 @@ PHP_FPM_MAX_CHILDREN: 5
 
 DOMSERVER_SSL_CERT: /etc/ssl/certs/localhost.crt
 DOMSERVER_SSL_KEY: /etc/ssl/private/localhost.key
+
+DB_DUMP_PREFIX: admin

provision-contest/ansible/group_vars/analyst/all.yml.example

@@ -10,3 +10,5 @@ DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.240"
 # internet access is available and "packages" must be used as APT repo
 # server.
 WF_GREEN: true
+
+DB_DUMP_PREFIX: analyst

provision-contest/ansible/group_vars/wf46/all.yml.example

@@ -2,3 +2,5 @@
 # DOMSERVER_IP will be added to the judgehost /etc/hosts file.
 DOMSERVER: https://domserver-wf46
 DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.215"
+
+DB_DUMP_PREFIX: 46

provision-contest/ansible/group_vars/wf47/all.yml.example

@@ -2,3 +2,5 @@
 # DOMSERVER_IP will be added to the judgehost /etc/hosts file.
 DOMSERVER: https://domjudge-wf47
 DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.218"
+
+DB_DUMP_PREFIX: 47

provision-contest/ansible/roles/mysql_server/tasks/main.yml

@@ -62,13 +62,18 @@
     - db-dumps
     - bin
 
-- name: Copy database dump/load scripts
+- name: Copy database load script
   copy:
-    src: "{{ item }}"
-    dest: /home/domjudge/bin/{{ item }}
+    src: load-db
+    dest: /home/domjudge/bin/load-db
+    owner: domjudge
+    group: domjudge
+    mode: 0755
+
+- name: Copy modified database dump script
+  template:
+    src: dump-db.j2
+    dest: /home/domjudge/bin/dump-db
     owner: domjudge
     group: domjudge
     mode: 0755
-  loop:
-    - load-db
-    - dump-db

provision-contest/ansible/roles/mysql_server/files/dump-db → provision-contest/ansible/roles/mysql_server/templates/dump-db.j2

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 create_database_dump () {
-	sudo mysqldump --opt --skip-lock-tables domjudge | pv | gzip > "/home/domjudge/db-dumps/${1}.sql.gz"
+	sudo mysqldump --opt --skip-lock-tables domjudge | pv | gzip > "/home/domjudge/db-dumps/{{ DB_DUMP_PREFIX }}-${1}.sql.gz"
 }
 
 if [ -z "$1" ]
@@ -11,12 +11,12 @@ then
 	exit 1
 fi
 
-if [ -f "/home/domjudge/db-dumps/${1}.sql.gz" ]; then
+if [ -f "/home/domjudge/db-dumps/{{ DB_DUMP_PREFIX }}-${1}.sql.gz" ]; then
 	while true; do
 		read -p "Overwrite existing database dump (y/N)? " yn
 			case $yn in
-				[Yy]* ) break ;;
-				''|[Nn]* ) exit 0;;
+				[Yy]* ) break;;
+				''|[Nn]* ) exit 2;;
 			esac
 	done
 fi