Update variables.yml

Author: vmcj

icpc-wf/ansible/common_tasks_all.yml

@@ -11,6 +11,7 @@
       apt:
         state: present
         pkg:
+        - acl
         - ack-grep
         - git
         - htop
@@ -51,7 +52,7 @@
 
     - name: set PHP timezone for CLI
       lineinfile:
-        dest: /etc/php/7.2/cli/php.ini
+        dest: /etc/php/7.4/cli/php.ini
         state: present
         regexp: 'date\.timezone\s*='
         line: 'date.timezone = {{TIMEZONE}}'
@@ -94,17 +95,6 @@
         mode: 0600
       when: DJ_GIT_SSH_KEY is defined
 
-    - name: Create SSH config
-      template: src=files/ssh-config-domjudge.j2 dest=/home/domjudge/.ssh/config owner=domjudge group=domjudge mode=0600
-      when: DJ_GIT_HOST is defined
-
-    - name: add all hosts to hosts file
-      lineinfile:
-        dest: /etc/hosts
-        regexp: '{{ item }}$'
-        line: "{{ hostvars[item].ansible_host }}	{{ item }}"
-      loop: "{{ groups['all'] }}"
-
     - name: configure domjudge logging
       copy: src=files/rsyslog.domjudge.conf dest=/etc/rsyslog.d/domjudge.conf
       notify: restart rsyslog

icpc-wf/ansible/common_tasks_packages_icpc-wf.yml

@@ -1,31 +1,10 @@
 # Common packaging stuff during ICPC World Finals.
 ---
-    - name: fix apt sources list
-      tags: packages
-      replace:
-        dest: /etc/apt/sources.list
-        regexp: 'pc2cancer\.ecs\.csus\.edu'
-        replace: 'packages'
-
-    - name: remove pycharm repo
-      tags: packages
-      replace:
-        dest: /etc/apt/sources.list
-        regexp: '^([^#].*pycharm.*)$'
-        replace: '# \1'
-
-    - name: add packages to hosts file
-      tags: packages
-      lineinfile:
-        dest: /etc/hosts
-        regexp: '^10\.3\.3\.209'
-        line: "10.3.3.209	packages"
-
-    - name: remove some packages
-      tags: packages
-      apt:
-        pkg: ntp
-        state: absent
+#    - name: remove some packages
+#      tags: packages
+#      apt:
+#        pkg: ntp
+#        state: absent
 
     - meta: flush_handlers
       tags: packages

icpc-wf/ansible/common_tasks_prebuild.yml

@@ -70,44 +70,6 @@
         owner: domjudge
         group: domjudge
 
-    - name: copy collectd configuration
-      template: src=files/collectd.conf.j2 dest=/etc/collectd/collectd.conf
-      notify: restart collectd
-      when: COLLECTD_MYSQL_PASSWORD is defined
-
-    - name: create directory for collectd mysql modules
-      file: path=/etc/collectd/collectd-python state=directory mode=0755
-      when:
-        - COLLECTD_MYSQL_PASSWORD is defined
-        - "'domjudge' == ansible_hostname or 'domjudge-laptop' in ansible_hostname or 'domjudge-backup' in ansible_hostname"
-
-    - name: copy mysql metrics collection script
-      copy: src=files/collectd-mysql.py dest=/etc/collectd/collectd-python/mysql.py mode=0755
-      when:
-        - COLLECTD_MYSQL_PASSWORD is defined
-        - "'domjudge' == ansible_hostname or 'domjudge-laptop' in ansible_hostname or 'domjudge-backup' in ansible_hostname"
-
-    - name: copy DOMjudge logo binary
-      copy: src=files/domlogo dest=/home/domjudge/domlogo owner=domjudge group=domjudge mode=0755
-
-    - name: enable GDM autologin
-      lineinfile:
-        path: /etc/gdm3/custom.conf
-        regexp: 'AutomaticLoginEnable'
-        line: 'AutomaticLoginEnable=true'
-      notify: restart gdm
-
-    - name: Automatically login domjudge user
-      lineinfile:
-        path: /etc/gdm3/custom.conf
-        regexp: 'AutomaticLogin'
-        line: 'AutomaticLogin=domjudge'
-      notify: restart gdm
-
-    - name: make sure autostart directory exists
-      file: dest=/home/domjudge/.config/autostart state=directory owner=domjudge group=domjudge
-      tags: fix_autostart
-
     - name: install SSL server certificates
       copy:
         src: "{{ item }}"

icpc-wf/ansible/domserver.yml

@@ -11,7 +11,7 @@
     - name: restart nginx
       service: name=nginx state=restarted
     - name: restart PHP FPM
-      service: name=php7.2-fpm state=restarted
+      service: name=php7.4-fpm state=restarted
     - name: update-ca-certificates
       command: update-ca-certificates
     - name: restart collectd
@@ -35,25 +35,26 @@
         - mariadb-server
         - nginx
         - php-fpm
-        - python-mysqldb
+        - python3-mysqldb
         - php-intl
         - mycli
         - macchanger
+        - acl
 
     - name: copy in MySQL config
       copy: src=files/my.cnf dest=/root/.my.cnf
 
     - name: set PHP timezone for FPM
       lineinfile:
-        dest: /etc/php/7.2/fpm/php.ini
+        dest: /etc/php/7.4/fpm/php.ini
         state: present
         regexp: 'date\.timezone\s*='
         line: 'date.timezone = {{TIMEZONE}}'
 
     - name: enable php modules
       command: phpenmod {{item}}
       args:
-        creates: /etc/php/7.2/fpm/conf.d/20-{{item}}.ini
+        creates: /etc/php/7.4/fpm/conf.d/20-{{item}}.ini
       with_items:
         - zip
         - intl
@@ -69,32 +70,6 @@
       copy: src=files/mysql.domjudge.cnf dest=/etc/mysql/mariadb.conf.d/zz_domjudge.cnf
       notify: restart mysql
 
-    - name: add mysql config snippet for replication
-      template: src=files/mysql.replication.cnf.j2 dest=/etc/mysql/mariadb.conf.d/zzz_replication.cnf
-      notify: restart mysql
-      when: REPLICATION_PASSWORD is defined
-
-    - name: disable mysql listen on localhost only
-      replace:
-        path: /etc/mysql/mariadb.conf.d/50-server.cnf
-        regexp: '^bind-address\s*='
-        replace: '#bind-address ='
-      when: REPLICATION_PASSWORD is defined
-
-    - name: copy script to setup replication
-      template: src=files/setup-replication.sh.j2 dest=/usr/local/sbin/setup-replication.sh mode=0755
-      when: REPLICATION_PASSWORD is defined
-
-    - name: create mysql replication user
-      mysql_user:
-        name: replication
-        host: '%'
-        password: "{{REPLICATION_PASSWORD}}"
-        append_privs: true
-        priv: '*.*:REPLICATION SLAVE'
-        state: present
-      when: REPLICATION_PASSWORD is defined
-
     - name: make sure mysql is restarted
       meta: flush_handlers
 
@@ -110,34 +85,10 @@
 
     - include: common_tasks_build.yml
 
-# When using replication, the DB will be dropped and recreated on the slave later.
-    - name: check if the database is configured
-      command: "{{DJ_DIR}}/bin/dj_setup_database -u root status"
-      register: db_status
-      ignore_errors: true
-    - name: make sure the database is configured
-      command: "{{DJ_DIR}}/bin/dj_setup_database -u root bare-install"
-      when: "'failed' in db_status.stdout"
-
-    - name: fix background color
-      lineinfile:
-        regexp: '^(\s*background-color):\s+white\s*;'
-        line: '\1: {{BACKGROUND_COLOR}};'
-        backrefs: yes
-        dest: "{{DJ_DIR}}/webapp/web/style.css"
-      when: BACKGROUND_COLOR is defined
-
     - name: disable developer mode
       lineinfile:
         regexp: '^APP_ENV=dev'
         state: absent
         dest: "{{DJ_DIR}}/webapp/.env.local"
 
     - include: nginx-setup.yml
-
-    - name: add autostart shortcuts
-      copy: src=files/{{item}}.desktop dest=/home/domjudge/.config/autostart/ owner=domjudge group=domjudge mode=0755
-      with_items:
-        - htop
-        - taillog-domserver-nginx-error
-        - taillog-domserver-symfony-error

icpc-wf/ansible/hosts

@@ -1,27 +1,9 @@
 [all:vars]
-ansible_user=root
+ansible_user=vmcj
 ansible_python_interpreter=/usr/bin/python3
 
 [domserver]
-domjudge             ansible_host=10.3.3.215
-domjudge-backup      ansible_host=10.3.3.216
-domjudge-laptop      ansible_host=10.3.3.200
+domjudge-vm             ansible_host=192.168.122.222
 
 [judgehost]
-domjudge-judgehost1  ansible_host=10.2.2.192
-domjudge-judgehost2  ansible_host=10.2.2.193
-domjudge-judgehost3  ansible_host=10.2.2.194
-domjudge-judgehost4  ansible_host=10.2.2.195
-domjudge-judgehost5  ansible_host=10.2.2.196
-domjudge-judgehost6  ansible_host=10.2.2.197
-domjudge-judgehost7  ansible_host=10.2.2.198
-domjudge-judgehost8  ansible_host=10.2.2.199
-domjudge-judgehost9  ansible_host=10.2.2.200
-domjudge-judgehost10 ansible_host=10.2.2.201
-
-[admin]
-domjudge-ccsadmin1 ansible_host=10.3.3.223
-domjudge-ccsadmin2 ansible_host=10.3.3.224
-domjudge-ccsadmin3 ansible_host=10.3.3.225
-domjudge-ccsadmin4 ansible_host=10.3.3.226
-domjudge-ccsadmin5 ansible_host=10.3.3.227
+judgehost-vm            ansible_host=192.168.122.230

icpc-wf/ansible/judgehost.yml

@@ -24,9 +24,9 @@
       user: name={{item}} createhome=no home=/nonexistent group=nogroup shell=/bin/false
       with_items:
         - domjudge-run-0
-        - domjudge-run-1
-        - domjudge-run-2
-        - domjudge-run-3
+        #- domjudge-run-1
+        #- domjudge-run-2
+        #- domjudge-run-3
     - name: create domjudge-run group
       group: name=domjudge-run state=present
 
@@ -42,7 +42,7 @@
         line: '#\1'
         backrefs: yes
 
-    - include: common_tasks_build.yml
+    #- include: common_tasks_build.yml
 
     - name: re-enable clearing Symfony cache when building
       lineinfile:
@@ -51,12 +51,12 @@
         line: '\1'
         backrefs: yes
 
-    - name: enable internal monitor
-      file: path=/usr/share/X11/xorg.conf.d/22-icpc.conf state=absent
+    #- name: enable internal monitor
+    #  file: path=/usr/share/X11/xorg.conf.d/22-icpc.conf state=absent
 
-    - name: remove apt-transport-https from bionic debootstrap file
+    - name: remove apt-transport-https from focal debootstrap file
       lineinfile:
-        path: /usr/share/debootstrap/scripts/bionic
+        path: /usr/share/debootstrap/scripts/focal
         regexp: 'ca-certificates'
         line: '                base="$base ca-certificates"'
 
@@ -105,10 +105,10 @@
         - tune_cpu
       notify: restart systemctl
 
-    - name: copy create-cgroups systemd unit file
-      copy: src={{DJ_DIR}}/misc-tools/create-cgroups.service dest=/etc/systemd/system/ remote_src=yes
-      tags: updateservice
-      notify: restart systemctl
+    #- name: copy create-cgroups systemd unit file
+    #  copy: src={{DJ_DIR}}/misc-tools/create-cgroups.service dest=/etc/systemd/system/ remote_src=yes
+    #  tags: updateservice
+    #  notify: restart systemctl
 
     - name: copy judgedaemon systemd unit file
       copy: src={{DJ_DIR}}/judge/domjudge-judgehost.service dest=/etc/systemd/system/ remote_src=yes
@@ -125,18 +125,18 @@
         - tune_cpu
         - domjudge-judgehost
 
-    - name: add autostart shortcuts
-      copy: src=files/{{item}}.desktop dest=/home/domjudge/.config/autostart/ owner=domjudge group=domjudge mode=0755
-      with_items:
-        - taillog
-        - rotate
-        - domjudgelogo
-
-    - name: disable systemd timers
-      command: systemctl mask {{item}}
-      args:
-        creates: /etc/systemd/system/{{item}}
-      with_items:
-        - apt-daily-upgrade.timer
-        - apt-daily.timer
-        - systemd-tmpfiles-clean.timer
+    #- name: add autostart shortcuts
+    #  copy: src=files/{{item}}.desktop dest=/home/domjudge/.config/autostart/ owner=domjudge group=domjudge mode=0755
+    #  with_items:
+    #    - taillog
+    #    - rotate
+    #    - domjudgelogo
+
+    #- name: disable systemd timers
+    #  command: systemctl mask {{item}}
+    #  args:
+    #    creates: /etc/systemd/system/{{item}}
+    #  with_items:
+    #    - apt-daily-upgrade.timer
+    #    - apt-daily.timer
+    #    - systemd-tmpfiles-clean.timer

icpc-wf/ansible/nginx-setup.yml

@@ -12,7 +12,7 @@
       notify: update-ca-certificates
 
     - name: copy in domjudge FPM conf
-      copy: src={{DJ_DIR}}/etc/domjudge-fpm.conf remote_src=yes dest=/etc/php/7.2/fpm/pool.d/domjudge.conf
+      copy: src={{DJ_DIR}}/etc/domjudge-fpm.conf remote_src=yes dest=/etc/php/7.4/fpm/pool.d/domjudge.conf
       notify: restart PHP FPM
 
     - name: copy in domjudge nginx conf
@@ -101,7 +101,7 @@
 
     - name: Set PHP settings
       lineinfile:
-        dest: /etc/php/7.2/fpm/pool.d/domjudge.conf
+        dest: /etc/php/7.4/fpm/pool.d/domjudge.conf
         regexp: "{{item.regexp}}"
         line: "{{item.key}} = {{item.value}}"
       with_items: