This is an automated email from the ASF dual-hosted git repository.
jhg03a pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 72af148 Move static files (#5882)
72af148 is described below
commit 72af148e857b75cf279292d80b592a7af85984fd
Author: jhowar201 <[email protected]>
AuthorDate: Fri Jun 18 12:52:44 2021 -0400
Move static files (#5882)
* Removing parameters related to old PERL paths
* Moving Static files to seperate URL
* reverting API version change
* Adding static file server to requirement in docs
---
.../ansible/roles/dataset_loader/README.md | 2 ++
.../ansible/roles/dataset_loader/defaults/main.yml | 22 ++++++++++------------
.../ansible/roles/traffic_ops/defaults/main.yml | 1 -
.../roles/traffic_ops/templates/cdn.conf.j2 | 3 ---
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/infrastructure/ansible/roles/dataset_loader/README.md
b/infrastructure/ansible/roles/dataset_loader/README.md
index f558c53..2d19fb8 100644
--- a/infrastructure/ansible/roles/dataset_loader/README.md
+++ b/infrastructure/ansible/roles/dataset_loader/README.md
@@ -30,6 +30,8 @@ A freshly installed and functional Traffic Ops. Users of
this playbook should a
Today this dataset loader assumes mostly pools of resources such as caches,
cachegroups, regions, etc. It will perform a round-robin assignment within the
resource pools automatically. If you need a different arrangement, you'll want
to craft your own supplamentory modification playbook or bypass the dataset
loader with a static dataset.
+A web server to host the static files for CZF and GeoIP needs to be responding
with the required content.
+
An ATS RPM that matches the version described by `ats_version` to be available
in an accessible yum repo to ORT.
It is also pesumed that you're using a working directory that contains
`./out/ssl/lab.intermediateca.crt` and `./out/ssl/lab.intermediateca.pem` in
order to sign Delivery Service SSL CSRs
diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
index 1fb5cbd..1025b60 100644
--- a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
+++ b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -18,6 +18,8 @@ load_dataset: false
dl_to_url: https://to.kabletown.invalid
# Url to use when contacting the timeseries visualizations from the TP UI
dl_ts_url: https://stats.kabletown.invalid
+# URL to use for static CDN config files
+dl_sf_url: https://czf.kabletown.invalid
# Credentials to use when logging into TrafficOps
dl_to_user:
dl_to_user_password:
@@ -25,13 +27,13 @@ dl_to_user_password:
dl_to_api_version: 1.3
dl_target_api_url: "{{ dl_to_url }}/api/{{ dl_to_api_version }}"
# URL for the CZF file
-dl_shallow_czf_url: "{{ to_url }}/czf.json"
+dl_shallow_czf_url: "{{ dl_sf_url }}/czf.json"
# URL for the the Anonymous IP configuration file
-dl_anonymous_ip_url: "{{ to_url }}/anonymousip.json"
+dl_anonymous_ip_url: "{{ dl_sf_url }}/anonymousip.json"
# URL for the MaxMind Geolocation database
-dl_geolocation_url: "{{ to_url }}/MaxMind/auto/GeoIP2-CityLite.mmdb.gz"
+dl_geolocation_url: "{{ dl_sf_url }}/MaxMind/auto/GeoIP2-CityLite.mmdb.gz"
# URL for the MaxMind Anonymous IP database
-dl_anonymous_db_url: "{{ to_url }}/MaxMind/auto/GeoIP2-Anonymous-IP.mmdb.gz"
+dl_anonymous_db_url: "{{ dl_sf_url }}/MaxMind/auto/GeoIP2-Anonymous-IP.mmdb.gz"
# Which IP Addresses are allowed to communicate with the astats endpoints on
each cache
dl_allow_ip4: "127.0.0.1"
dl_allow_ip6: "::1"
@@ -347,7 +349,7 @@ dl_ds_default_profiles:
parameters:
- name: geolocation.polling.url
configFile: CRConfig.json
- value: "{{ dl_to_url }}/MaxMind/auto/GeoLiteCity.dat.gz"
+ value: "{{ dl_sf_url }}/MaxMind/auto/GeoLiteCity.dat.gz"
secure: 0
- name: all_graph_url
configFile: global
@@ -385,10 +387,6 @@ dl_ds_default_profiles:
configFile: global
value: Apache Traffic Control CDN
secure: 0
- - name: tm.logourl
- configFile: global
- value: "/images/tc_logo.png"
- secure: 0
- name: tm.rev_proxy.url
configFile: global
value: "{{ dl_to_url }}:81"
@@ -692,7 +690,7 @@ dl_ds_default_profile_cdntemplates:
secure: 0
- name: anonymousip.polling.interval
configFile: CRConfig.json
- value: '86400000'
+ value: '86400000'
secure: 0
- name: api.cache-control.max-age
configFile: CRConfig.json
@@ -4046,9 +4044,9 @@ dl_ds_default_ds_template:
eligible_mso_server_profile_names:
- "MSO_{{ Target_cdn_delegation }}_Weighted_Primary"
- "MSO_{{ Target_cdn_delegation }}_Weighted_Secondary"
- - displayName: HTTP Routed with Anonymous IP Block
+ - displayName: HTTP Routed with Anonymous IP Block
longDesc: A basic HTTP routed Delivery Service with Anonymous IP Block
Enabled
- anonymousBlockingEnabled: true
+ anonymousBlockingEnabled: true
uniqueKey: simple-http-anon-block
# Federations
diff --git a/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
b/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
index db366c2..1c78a30 100644
--- a/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
@@ -27,7 +27,6 @@ to_group: trafops # currently hardcoded into TO
# TO Installation information
to_base_installdir: /opt/traffic_ops
to_app_installdir: "{{ to_base_installdir }}/app"
-to_public_dir: "{{ to_app_installdir }}/public"
to_db_installdir: "{{ to_app_installdir }}/db"
to_conf_installdir: "{{ to_app_installdir }}/conf"
to_install_installdir: "{{ to_base_installdir }}/install"
diff --git a/infrastructure/ansible/roles/traffic_ops/templates/cdn.conf.j2
b/infrastructure/ansible/roles/traffic_ops/templates/cdn.conf.j2
index 411800c..90c09a6 100644
--- a/infrastructure/ansible/roles/traffic_ops/templates/cdn.conf.j2
+++ b/infrastructure/ansible/roles/traffic_ops/templates/cdn.conf.j2
@@ -15,9 +15,6 @@
"cors" : {
"access_control_allow_origin" : "{{ to_cors_access_control_allow_origin
}}"
},
- "geniso" : {
- "iso_root_path" : "{{ to_public_dir }}"
- },
"hypnotoad" : {
"accept_interval" : {{ to_hypnotoad_accept_interval }},
"group" : "{{ to_group }}",
