Address comments from Nicky+Jaap

Author: vmcj

icpc-wf/ansible/group_vars/all/all.yml

@@ -37,9 +37,10 @@ PHP_MAX_FILE_UPLOADS: 101
 
 # Git repo URL
 DJ_GIT_HOST: "{{MAIN_ADMIN_IP}}"
-DJ_GIT_REPO: "domjudge@{{DJ_GIT_HOST}}:domjudge"
-DJ_GIT_REPO_UPSTREAM: "https://github.com/domjudge/domjudge.git"
-DJ_GIT_REPO_SCRIPTS: "domjudge@{{DJ_GIT_HOST}}:domjudge-scripts-bare"
+DJ_GIT_REPO: "https://github.com/domjudge/domjudge.git"
+DJ_GIT_REPO_RESTRICTED: "domjudge@{{DJ_GIT_HOST}}:domjudge"
+DJ_GIT_REPO_SCRIPTS: "https://github.com/domjudge/domjudge-scripts.git"
+DJ_GIT_REPO_SCRIPTS_RESTRICTED: "domjudge@{{DJ_GIT_HOST}}:domjudge-scripts-bare"
 
 PHPSTORM_VERSION: 2021.2
 PHPSTORM_FULL_VERSION: 212.5284.49

icpc-wf/ansible/roles/domjudge_checkout/tasks/main.yml

@@ -8,20 +8,17 @@
     owner: domjudge
     group: domjudge
 
-- name: create working copy of the domjudge repo
+- name: Update repo URL based on network
+  set_fact:
+    DJ_GIT_REPO: "{{ DJ_GIT_REPO_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO}}"
+
+- name: Create working copy of the domjudge repo
   become: yes
   become_user: domjudge
   git: repo={{DJ_GIT_REPO}} dest={{DJ_DIR}} version={{DJ_BRANCH}} accept_hostkey=yes update=yes
   register: git_working_copy
   when: WF_RESTRICTED_NETWORK
 
-- name: create working copy of the domjudge repo
-  become: yes
-  become_user: domjudge
-  git: repo={{DJ_GIT_REPO_UPSTREAM}} dest={{DJ_DIR}} version={{DJ_BRANCH}} accept_hostkey=yes update=yes
-  register: git_working_copy
-  when: WF_RESTRICTED_NETWORK != true
-
 - name: Check composer dependencies present
   become: no
   local_action: stat path=files/lib/vendor