Update variables.yml

Author: vmcj

icpc-wf/ansible/common_tasks_all.yml

@@ -6,11 +6,19 @@
 
     - include: common_tasks_packages_icpc-wf.yml
 
+    - name: Update and upgrade apt packages
+      become: true
+      apt:
+        upgrade: yes
+        update_cache: yes
+        cache_valid_time: 86400 #One day
+
     - name: install common required/useful packages
       tags: packages
       apt:
         state: present
         pkg:
+        - acl
         - ack-grep
         - git
         - htop
@@ -94,17 +102,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: 'pc2\.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

@@ -87,28 +87,6 @@
         - 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'
-        create: yes
-      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

@@ -39,6 +39,7 @@
         - php-intl
         - mycli
         - macchanger
+        - acl
 
     - name: copy in MySQL config
       copy: src=files/my.cnf dest=/root/.my.cnf
@@ -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
 
@@ -119,25 +94,10 @@
       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.28
 
 [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.78

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
 
@@ -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"'
 
@@ -133,24 +133,9 @@
         - 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 apport service
       service:
         name: apport
         enabled: no
         state: stopped
 
-    - 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/variables.yml

@@ -9,13 +9,13 @@ DJ_BRANCH: master
 
 # URL and IP of domserver from judgehosts. A hostname 'domserver' with
 # DOMSERVER_IP will be added to the judgehost /etc/hosts file.
-DOMSERVER: https://domjudge
-DOMSERVER_IP: 10.3.3.215
+DOMSERVER: https://dj.storm.vu
+DOMSERVER_IP: 130.37.193.150
 DOMSERVER_URL: "{{DOMSERVER}}"
-DOMSERVER_SSL_CERT: /etc/ssl/certs/domserver.crt
-DOMSERVER_SSL_KEY: /etc/ssl/private/domserver.key
+DOMSERVER_SSL_CERT: /etc/ssl/certs/localhost.crt
+DOMSERVER_SSL_KEY: /etc/ssl/private/localhost.key
 
-TIMEZONE: "Europe/Moscow"
+TIMEZONE: "Europe/Amsterdam"
 
 PHP_FPM_MAX_CHILDREN: 400
 PHP_FPM_MAX_REQUESTS: 500
@@ -26,7 +26,7 @@ PHP_MAX_FILE_UPLOADS: 101
 
 # Password for the MySQL replication user.
 # Set this to enable master-master replication between two domservers.
-REPLICATION_PASSWORD: some-replication-password
+#REPLICATION_PASSWORD: some-replication-password
 
 # Password for the collectd MySQL status user.
 # Set this to enable collectd for system statistics collection.
@@ -46,15 +46,15 @@ ADMIN_PASSWORD: some-admin-password
 #DJ_SHELL_USER_PW: some-hashed-password
 
 # Git repo URL
-DJ_GIT_REPO: [email protected]:domjudge
+DJ_GIT_REPO: https://github.com/DOMjudge/domjudge.git
 
 # If using a Git repo which requires a SSH key, set the host and key here
-DJ_GIT_HOST: 10.3.3.223
-DJ_GIT_SSH_KEY: |
-    -----BEGIN OPENSSH PRIVATE KEY-----
-    ENTER SSH PRIVATE KEY HERE
-    -----END OPENSSH PRIVATE KEY-----
+DJ_GIT_HOST: github.com
+#DJ_GIT_SSH_KEY: |
+#    -----BEGIN OPENSSH PRIVATE KEY-----
+#    ENTER SSH PRIVATE KEY HERE
+#    -----END OPENSSH PRIVATE KEY-----
 
 
 # Key for domjudge user
-DJ_SSH_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPsTOPgh8QYBudu7IOLETq4ek13RBB+pM/spOboCK1wO domjudge@domjudge-ccsadmin1
+DJ_SSH_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAe/eK/AmBHx4cEvvmb+HBg/h9aptCvHfv9sxkdvTr07 vmcj@lenovo