forked from LibreSchool/server-config
Merge pull request #28 from syntaxerrormmm/master
Fix issue #27: try to honor domain.yml mirror_host variable.
This commit is contained in:
commit
baa5cd96c3
@ -8,5 +8,6 @@ mirror_security_host: security.ubuntu.com
|
|||||||
mirror_security_path: /ubuntu
|
mirror_security_path: /ubuntu
|
||||||
mirror_localpath: /ks/mirror
|
mirror_localpath: /ks/mirror
|
||||||
execpath: ""
|
execpath: ""
|
||||||
|
execsecurepath: ""
|
||||||
execmirrorpath: ""
|
execmirrorpath: ""
|
||||||
development: false
|
development: false
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
- include: mirror-cfg.yml
|
- include: mirror-cfg.yml
|
||||||
tags:
|
tags:
|
||||||
- preseed
|
- preseed
|
||||||
|
- repoconfig
|
||||||
|
|
||||||
- include: preseed.yml
|
- include: preseed.yml
|
||||||
tags:
|
tags:
|
||||||
|
@ -6,19 +6,27 @@
|
|||||||
when: "ansible_local.domain.mirror_mode is defined"
|
when: "ansible_local.domain.mirror_mode is defined"
|
||||||
|
|
||||||
- name: Determining mirror_host
|
- name: Determining mirror_host
|
||||||
set_fact: mirror_host="{{ ansible_local.domain.mirror_host }}"
|
set_fact:
|
||||||
|
mirror_host: "{{ ansible_local.domain.mirror_host }}"
|
||||||
|
orig_mirror_host: "{{ ansible_local.domain.mirror_host }}"
|
||||||
when: ansible_local.domain.mirror_host is defined
|
when: ansible_local.domain.mirror_host is defined
|
||||||
|
|
||||||
- name: Determining mirror_path
|
- name: Determining mirror_path
|
||||||
set_fact: mirror_path="{{ ansible_local.domain.mirror_path }}"
|
set_fact:
|
||||||
|
mirror_path: "{{ ansible_local.domain.mirror_path }}"
|
||||||
|
orig_mirror_path: "{{ ansible_local.domain.mirror_path }}"
|
||||||
when: ansible_local.domain.mirror_path is defined
|
when: ansible_local.domain.mirror_path is defined
|
||||||
|
|
||||||
- name: Determining mirror_security_host
|
- name: Determining mirror_security_host
|
||||||
set_fact: mirror_security_host="{{ ansible_local.domain.mirror_security_host }}"
|
set_fact:
|
||||||
|
mirror_security_host: "{{ ansible_local.domain.mirror_security_host }}"
|
||||||
|
orig_mirror_security_host: "{{ ansible_local.domain.mirror_security_host }}"
|
||||||
when: ansible_local.domain.mirror_security_host is defined
|
when: ansible_local.domain.mirror_security_host is defined
|
||||||
|
|
||||||
- name: Determining mirror_security_path
|
- name: Determining mirror_security_path
|
||||||
set_fact: mirror_security_path="{{ ansible_local.domain.mirror_security_path }}"
|
set_fact:
|
||||||
|
mirror_security_path: "{{ ansible_local.domain.mirror_security_path }}"
|
||||||
|
orig_mirror_security_path: "{{ ansible_local.domain.mirror_security_path }}"
|
||||||
when: ansible_local.domain.mirror_security_path is defined
|
when: ansible_local.domain.mirror_security_path is defined
|
||||||
|
|
||||||
- name: Determining mirror_localpath
|
- name: Determining mirror_localpath
|
||||||
@ -28,13 +36,10 @@
|
|||||||
# The remote option is already configured as it is.
|
# The remote option is already configured as it is.
|
||||||
|
|
||||||
# Configuring correctly local mirror
|
# Configuring correctly local mirror
|
||||||
- name: Determining variables for local and nfs mode
|
- name: Altering paths
|
||||||
set_fact:
|
set_fact:
|
||||||
orig_mirror_path: ”{{ mirror_path }}"
|
execmirrorpath: "{{ mirror_host }}{{ mirror_path }}"
|
||||||
orig_mirror_host: "{{ mirror_host }}"
|
execsecurepath: "{{ mirror_security_host }}{{ mirror_security_path }}"
|
||||||
orig_mirror_security_path: "{{ mirror_security_path }}"
|
|
||||||
orig_mirror_security_host: "{{ mirror_security_host }}"
|
|
||||||
execmirrorpath: ”{{ mirror_host }}{{ mirror_path }}"
|
|
||||||
execpath: "{{ ansible_local.domain.serverfqdn }}{{ mirror_localpath }}/"
|
execpath: "{{ ansible_local.domain.serverfqdn }}{{ mirror_localpath }}/"
|
||||||
mirror_path: "{{ mirror_localpath }}/{{ mirror_host }}{{ mirror_path }}"
|
mirror_path: "{{ mirror_localpath }}/{{ mirror_host }}{{ mirror_path }}"
|
||||||
mirror_host: "{{ ansible_local.domain.serverfqdn }}"
|
mirror_host: "{{ ansible_local.domain.serverfqdn }}"
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
# Base repositories for Ubuntu 14.04 - Trusty Tahr
|
# Base repositories for Ubuntu 14.04 - Trusty Tahr
|
||||||
deb http://{{ execpath }}{{ host }}{{ path }} trusty main restricted universe multiverse
|
deb http://{{ mirror_host }}{{ mirror_path }} trusty main restricted universe multiverse
|
||||||
deb http://{{ execpath }}{{ host }}{{ path }} trusty-security main restricted universe multiverse
|
deb http://{{ mirror_host }}{{ mirror_path }} trusty-security main restricted universe multiverse
|
||||||
deb http://{{ execpath }}{{ host }}{{ path }} trusty-updates main restricted universe multiverse
|
deb http://{{ mirror_host }}{{ mirror_path }} trusty-updates main restricted universe multiverse
|
||||||
deb http://{{ execpath }}{{ host }}{{ path }} trusty-backports main restricted universe multiverse
|
deb http://{{ mirror_host }}{{ mirror_path }} trusty-backports main restricted universe multiverse
|
||||||
|
|
||||||
# Sources
|
# Sources
|
||||||
#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty main restricted universe multiverse
|
#deb-src http://{{ mirror_host }}{{ mirror_path }} trusty main restricted universe multiverse
|
||||||
#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty-security main restricted universe multiverse
|
#deb-src http://{{ mirror_host }}{{ mirror_path }} trusty-security main restricted universe multiverse
|
||||||
#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty-updates main restricted universe multiverse
|
#deb-src http://{{ mirror_host }}{{ mirror_path }} trusty-updates main restricted universe multiverse
|
||||||
#deb-src http://{{ execpath }}{{ host }}{{ path }} trusty-backports main restricted universe multiverse
|
#deb-src http://{{ mirror_host }}{{ mirror_path }} trusty-backports main restricted universe multiverse
|
||||||
|
|
||||||
# Security
|
# Security
|
||||||
deb http://{{ execpath }}{{ shost }}{{ spath }} trusty-security main restricted universe multiverse
|
deb http://{{ mirror_security_host }}{{ mirror_security_path }} trusty-security main restricted universe multiverse
|
||||||
#deb-src http://{{ execpath }}{{ shost }}{{ spath }} trusty-security main restricted universe multiverse
|
#deb-src http://{{ mirror_security_host }}{{ mirror_security_path }} trusty-security main restricted universe multiverse
|
||||||
|
|
||||||
# Extras
|
# Extras
|
||||||
deb http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main
|
deb http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main
|
||||||
|
Loading…
x
Reference in New Issue
Block a user