diff --git a/defaults/main/ood_portal.yml b/defaults/main/ood_portal.yml index 48f08ca..e42402c 100644 --- a/defaults/main/ood_portal.yml +++ b/defaults/main/ood_portal.yml @@ -81,10 +81,6 @@ nginx_app_root: usr: "{{ ood_usr_app_dir }}/%{owner}/gateway/%{name}" sys: "{{ ood_sys_app_dir }}/%{name}" - -# analytics_url: "http://www.google-analytics.com/collect" -# analytics_id: "123-my-id" - httpd_public_uri: "/public" httpd_public_root: "/var/www/ood/public" diff --git a/molecule/default/fixtures/config/ood_portal.yml.custom.apache2 b/molecule/default/fixtures/config/ood_portal.yml.custom.apache2 index 9690c1d..07a775a 100644 --- a/molecule/default/fixtures/config/ood_portal.yml.custom.apache2 +++ b/molecule/default/fixtures/config/ood_portal.yml.custom.apache2 @@ -218,16 +218,6 @@ custom_location_directives: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: /pun/sys/dashboard -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -#analytics: null - # # Publicly available assets # diff --git a/molecule/default/fixtures/config/ood_portal.yml.custom.httpd b/molecule/default/fixtures/config/ood_portal.yml.custom.httpd index 59cea6f..1677636 100644 --- a/molecule/default/fixtures/config/ood_portal.yml.custom.httpd +++ b/molecule/default/fixtures/config/ood_portal.yml.custom.httpd @@ -218,16 +218,6 @@ custom_location_directives: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: /pun/sys/dashboard -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -#analytics: null - # # Publicly available assets # diff --git a/molecule/default/fixtures/config/ood_portal.yml.default.apache2 b/molecule/default/fixtures/config/ood_portal.yml.default.apache2 index 6dd1f1c..ed2c90c 100644 --- a/molecule/default/fixtures/config/ood_portal.yml.default.apache2 +++ b/molecule/default/fixtures/config/ood_portal.yml.default.apache2 @@ -209,16 +209,6 @@ auth: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: /pun/sys/dashboard -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -#analytics: null - # # Publicly available assets # diff --git a/molecule/default/fixtures/config/ood_portal.yml.default.httpd b/molecule/default/fixtures/config/ood_portal.yml.default.httpd index c20fbcb..9f12d41 100644 --- a/molecule/default/fixtures/config/ood_portal.yml.default.httpd +++ b/molecule/default/fixtures/config/ood_portal.yml.default.httpd @@ -209,16 +209,6 @@ auth: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: /pun/sys/dashboard -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -#analytics: null - # # Publicly available assets # diff --git a/molecule/default/fixtures/config/ood_portal.yml.oidc.apache2 b/molecule/default/fixtures/config/ood_portal.yml.oidc.apache2 index f7fc07b..f1a5a2a 100644 --- a/molecule/default/fixtures/config/ood_portal.yml.oidc.apache2 +++ b/molecule/default/fixtures/config/ood_portal.yml.oidc.apache2 @@ -210,16 +210,6 @@ auth: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: /pun/sys/dashboard -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -#analytics: null - # # Publicly available assets # diff --git a/molecule/default/fixtures/config/ood_portal.yml.oidc.httpd b/molecule/default/fixtures/config/ood_portal.yml.oidc.httpd index a6a31d0..694675d 100644 --- a/molecule/default/fixtures/config/ood_portal.yml.oidc.httpd +++ b/molecule/default/fixtures/config/ood_portal.yml.oidc.httpd @@ -210,16 +210,6 @@ auth: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: /pun/sys/dashboard -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -#analytics: null - # # Publicly available assets # diff --git a/templates/ood_portal.yml.j2 b/templates/ood_portal.yml.j2 index 2853c04..818baf1 100644 --- a/templates/ood_portal.yml.j2 +++ b/templates/ood_portal.yml.j2 @@ -280,22 +280,6 @@ custom_location_directives: # Default: '/pun/sys/dashboard' (default location of the OOD Dashboard app) root_uri: {{ root_uri }} -# Track server-side analytics with a Google Analytics account and property -# (see https://github.com/OSC/mod_ood_proxy/blob/master/lib/analytics.lua for -# information on how to setup the GA property) -# Example: -# analytics: -# url: 'http://www.google-analytics.com/collect' -# id: 'UA-79331310-4' -# Default: null (do not track) -{% if analytics_url is defined and analytics_id is defined %} -analytics: - url: "{{ analytics_url }}" - id: "{{ analytics_id }}" -{% else %} -#analytics: null -{% endif %} - # # Publicly available assets #