Merge "parametrized aptly.server ubuntu mirror url"
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
index 3625d51..5ae8bdb 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-backports-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-backports-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-backports-main_distribution: trusty-backports
mirror_trusty-backports-main_components: main
mirror_trusty-backports-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
index 96dc420..d04b27a 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-backports-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-backports-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-backports-multiverse_distribution: trusty-backports
mirror_trusty-backports-multiverse_components: multiverse
mirror_trusty-backports-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
index 712bebc..21b6a27 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-backports-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-backports-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-backports-restricted_distribution: trusty-backports
mirror_trusty-backports-restricted_components: restricted
mirror_trusty-backports-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
index f18b504..0134502 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-backports-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-backports-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-backports-universe_distribution: trusty-backports
mirror_trusty-backports-universe_components: universe
mirror_trusty-backports-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
index 7164628..6aadd64 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-proposed-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-proposed-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-proposed-main_distribution: trusty-proposed
mirror_trusty-proposed-main_components: main
mirror_trusty-proposed-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
index 9227036..af81ef1 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-proposed-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-proposed-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-proposed-multiverse_distribution: trusty-proposed
mirror_trusty-proposed-multiverse_components: multiverse
mirror_trusty-proposed-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
index f5378b9..519cb0f 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-proposed-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-proposed-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-proposed-restricted_distribution: trusty-proposed
mirror_trusty-proposed-restricted_components: restricted
mirror_trusty-proposed-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
index b6f321b..f3a5c34 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-proposed-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-proposed-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-proposed-universe_distribution: trusty-proposed
mirror_trusty-proposed-universe_components: universe
mirror_trusty-proposed-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
index 1a797f7..9b0dbf6 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-security-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-security-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-security-main_distribution: trusty-security
mirror_trusty-security-main_components: main
mirror_trusty-security-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
index b38e42b..6bb3f80 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-security-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-security-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-security-multiverse_distribution: trusty-security
mirror_trusty-security-multiverse_components: multiverse
mirror_trusty-security-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
index 76d2b4a..1810a8d 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-security-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-security-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-security-restricted_distribution: trusty-security
mirror_trusty-security-restricted_components: restricted
mirror_trusty-security-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
index 33d42f5..8700025 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-security-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-security-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-security-universe_distribution: trusty-security
mirror_trusty-security-universe_components: universe
mirror_trusty-security-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
index d7db631..bc4e985 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-updates-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-updates-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-updates-main_distribution: trusty-updates
mirror_trusty-updates-main_components: main
mirror_trusty-updates-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
index 518b0ff..1b0b21b 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-updates-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-updates-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-updates-multiverse_distribution: trusty-updates
mirror_trusty-updates-multiverse_components: multiverse
mirror_trusty-updates-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
index 1b7ea0f..7a6c4a6 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-updates-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-updates-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-updates-restricted_distribution: trusty-updates
mirror_trusty-updates-restricted_components: restricted
mirror_trusty-updates-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
index 3f4d815..f64f9b3 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-updates-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-updates-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-updates-universe_distribution: trusty-updates
mirror_trusty-updates-universe_components: universe
mirror_trusty-updates-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
index 3a054e7..33b4693 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-main_distribution: trusty
mirror_trusty-main_components: main
mirror_trusty-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
index 37a0b05..68f1586 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-multiverse_distribution: trusty
mirror_trusty-multiverse_components: multiverse
mirror_trusty-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
index dca087a..78d552c 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-restricted_distribution: trusty
mirror_trusty-restricted_components: restricted
mirror_trusty-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
index a112b94..f24c1ab 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_trusty-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_trusty-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_trusty-universe_distribution: trusty
mirror_trusty-universe_components: universe
mirror_trusty-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
index f9ad68e..1fbb17d 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-backports-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-backports-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-backports-main_distribution: xenial-backports
mirror_xenial-backports-main_components: main
mirror_xenial-backports-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
index 3ef9908..be45547 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-backports-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-backports-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-backports-multiverse_distribution: xenial-backports
mirror_xenial-backports-multiverse_components: multiverse
mirror_xenial-backports-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
index 5a32ee2..dcf8ede 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-backports-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-backports-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-backports-restricted_distribution: xenial-backports
mirror_xenial-backports-restricted_components: restricted
mirror_xenial-backports-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
index aca402e..9945a73 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-backports-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-backports-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-backports-universe_distribution: xenial-backports
mirror_xenial-backports-universe_components: universe
mirror_xenial-backports-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
index 920a16f..1ec8777 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-proposed-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-proposed-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-proposed-main_distribution: xenial-proposed
mirror_xenial-proposed-main_components: main
mirror_xenial-proposed-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
index aa6cf27..48a2ddc 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-proposed-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-proposed-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-proposed-multiverse_distribution: xenial-proposed
mirror_xenial-proposed-multiverse_components: multiverse
mirror_xenial-proposed-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
index 78aef0b..d301c81 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-proposed-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-proposed-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-proposed-restricted_distribution: xenial-proposed
mirror_xenial-proposed-restricted_components: restricted
mirror_xenial-proposed-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
index 618e4e8..8ddd769 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-proposed-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-proposed-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-proposed-universe_distribution: xenial-proposed
mirror_xenial-proposed-universe_components: universe
mirror_xenial-proposed-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
index dc1309a..a4977cc 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-security-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-security-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-security-main_distribution: xenial-security
mirror_xenial-security-main_components: main
mirror_xenial-security-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
index 77fcd1c..8b40566 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-security-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-security-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-security-multiverse_distribution: xenial-security
mirror_xenial-security-multiverse_components: multiverse
mirror_xenial-security-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
index b6046ff..82beadd 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-security-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-security-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-security-restricted_distribution: xenial-security
mirror_xenial-security-restricted_components: restricted
mirror_xenial-security-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
index 0a41112..6383be6 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-security-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-security-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-security-universe_distribution: xenial-security
mirror_xenial-security-universe_components: universe
mirror_xenial-security-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
index a97dcc4..810e8f6 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-updates-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-updates-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-updates-main_distribution: xenial-updates
mirror_xenial-updates-main_components: main
mirror_xenial-updates-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
index 2373c56..13546b2 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-updates-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-updates-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-updates-multiverse_distribution: xenial-updates
mirror_xenial-updates-multiverse_components: multiverse
mirror_xenial-updates-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
index 74aba0b..870caa0 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-updates-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-updates-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-updates-restricted_distribution: xenial-updates
mirror_xenial-updates-restricted_components: restricted
mirror_xenial-updates-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
index cf8c817..cf050fd 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-updates-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-updates-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-updates-universe_distribution: xenial-updates
mirror_xenial-updates-universe_components: universe
mirror_xenial-updates-universe_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
index 4d9db03..c1e5969 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-main_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-main_distribution: xenial
mirror_xenial-main_components: main
mirror_xenial-main_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
index a74c520..aff82a6 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-multiverse_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-multiverse_distribution: xenial
mirror_xenial-multiverse_components: multiverse
mirror_xenial-multiverse_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
index bde6b36..78a8ca9 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-restricted_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-restricted_distribution: xenial
mirror_xenial-restricted_components: restricted
mirror_xenial-restricted_gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
index b24cc1a..c0c67ff 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
@@ -2,7 +2,8 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- mirror_xenial-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ ubuntu_mirror_url: ${_param:linux_system_country_code}.archive.ubuntu.com
+ mirror_xenial-universe_source: http://${_param:ubuntu_mirror_url}/ubuntu/
mirror_xenial-universe_distribution: xenial
mirror_xenial-universe_components: universe
mirror_xenial-universe_gpgkeys: