diff options
| -rw-r--r-- | ansible/group_vars/ick-workers.yml | 7 | ||||
| -rw-r--r-- | ansible/group_vars/infinland.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ick-worker/tasks/pbuilder.yml | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ansible/group_vars/ick-workers.yml b/ansible/group_vars/ick-workers.yml index 0929b67..8d3a577 100644 --- a/ansible/group_vars/ick-workers.yml +++ b/ansible/group_vars/ick-workers.yml @@ -1,7 +1,6 @@ timezone: Europe/Helsinki -debian_mirror: debmirror -debian_mirror_src: null -othermirror: code.liw.fi +pbuilder_mirror: http://debmirror/debian +pbuilder_othermirror: code.liw.fi pbuilder_ci_tgz: /var/cache/pbuilder/ci.tgz pbuilder_release_tgz: /var/cache/pbuilder/release.tgz -unix_users: []
\ No newline at end of file +unix_users: [] diff --git a/ansible/group_vars/infinland.yml b/ansible/group_vars/infinland.yml index 7177b8d..ec0caf5 100644 --- a/ansible/group_vars/infinland.yml +++ b/ansible/group_vars/infinland.yml @@ -1,5 +1,5 @@ timezone: Europe/Helsinki -debian_mirror: ftp.fi.debian.org +debian_mirror: ftp.se.debian.org debian_mirror_src: httpredir.debian.org relayhost: pieni.net:587 smarthost: pieni.net diff --git a/ansible/roles/ick-worker/tasks/pbuilder.yml b/ansible/roles/ick-worker/tasks/pbuilder.yml index 5b0d254..a2227a7 100644 --- a/ansible/roles/ick-worker/tasks/pbuilder.yml +++ b/ansible/roles/ick-worker/tasks/pbuilder.yml @@ -6,7 +6,8 @@ creates: "{{ pbuilder_ci_tgz }}" shell: | pbuilder --create --distribution {{ distro }} \ - --othermirror "deb http://{{ othermirror }}/debian {{ distro }} main" \ + --mirror "{{ pbuilder_mirror }}" \ + --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ distro }} main" \ --basetgz "{{ pbuilder_ci_tgz }}" - name: create pbuilder release basetgz @@ -14,5 +15,6 @@ creates: "{{ pbuilder_release_tgz }}" shell: | pbuilder --create --distribution {{ distro }} \ - --othermirror "deb http://{{ othermirror }}/debian {{ distro }} main" \ + --mirror "{{ pbuilder_mirror }}" \ + --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ distro }} main" \ --basetgz "{{ pbuilder_release_tgz }}" |