From 5f7864f24f225038c51c68fe0b3f3fa92a5930dd Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 31 Jul 2020 11:08:39 -0400 Subject: [PATCH] put in web-data-analysis changes to get proxies to work --- playbooks/include/proxies-reverseproxy.yml | 13 ++--- .../files/html/awstats-index.html | 51 ------------------- .../{awstats-reports.css => data-reports.css} | 0 .../files/html/main-index.html | 3 +- .../web-data-analysis/files/html/summary.html | 11 ++-- roles/web-data-analysis/tasks/main.yml | 16 +----- 6 files changed, 14 insertions(+), 80 deletions(-) delete mode 100644 roles/web-data-analysis/files/html/awstats-index.html rename roles/web-data-analysis/files/html/css/{awstats-reports.css => data-reports.css} (100%) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index cbeaae7c75..de5b7de6ce 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -439,6 +439,13 @@ # Talk directly to the app server, not haproxy proxyurl: http://log01 + - role: httpd/reverseproxy + website: data-analysis.fedoraproject.org + destname: data-analysis + remotepath: / + localpath: / + proxyurl: http://log01 + ### entries for resultsdb and resultsdb_frontend - role: httpd/reverseproxy website: taskotron.fedoraproject.org @@ -679,9 +686,3 @@ keephost: true tags: fpdc - - role: httpd/reverseproxy - website: data-analysis.fedoraproject.org - destname: awstats - remotepath: / - localpath: / - proxyurl: http://data-analysis01.{{ datacenter }}.fedoraproject.org diff --git a/roles/web-data-analysis/files/html/awstats-index.html b/roles/web-data-analysis/files/html/awstats-index.html deleted file mode 100644 index 14ddfc176a..0000000000 --- a/roles/web-data-analysis/files/html/awstats-index.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - AWStats Reports - - -

Index by Year

- - - - diff --git a/roles/web-data-analysis/files/html/css/awstats-reports.css b/roles/web-data-analysis/files/html/css/data-reports.css similarity index 100% rename from roles/web-data-analysis/files/html/css/awstats-reports.css rename to roles/web-data-analysis/files/html/css/data-reports.css diff --git a/roles/web-data-analysis/files/html/main-index.html b/roles/web-data-analysis/files/html/main-index.html index b17d9cc7bd..a85f3efe1a 100644 --- a/roles/web-data-analysis/files/html/main-index.html +++ b/roles/web-data-analysis/files/html/main-index.html @@ -23,7 +23,7 @@ - +

What we have

@@ -31,7 +31,6 @@
  • CSV Data
  • Images from that CSV data
  • Particular images
    • -
  • Awstats of Fedora websites
    • diff --git a/roles/web-data-analysis/files/html/summary.html b/roles/web-data-analysis/files/html/summary.html index 6170d34342..3b169d23dc 100644 --- a/roles/web-data-analysis/files/html/summary.html +++ b/roles/web-data-analysis/files/html/summary.html @@ -22,21 +22,20 @@ - + - - - - - + + + + diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index b498aa9c47..7dc4d747e5 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -34,17 +34,7 @@ - name: css files copy: src={{item}} dest=/var/www/html/css/ mode=0644 - with_items: [ html/css/awstats-reports.css, html/css/normalize.css ] - tags: - - web-data - -- name: make an awstats directory - file: path=/var/www/html/awstats-reports/ state=directory mode=0755 - tags: - - web-data - -- name: copy over its index - copy: src=html/awstats-index.html dest=/var/www/html/awstats-reports/index.html mode=0644 + with_items: [ html/css/data-reports.css, html/css/normalize.css ] tags: - web-data @@ -95,7 +85,3 @@ - web-data - cron -- name: copy over the httpd config to lock kerberos - copy: src=httpd_config.conf dest=/etc/httpd/conf.d/krb_config.conf mode=0644 - tags: - - web-data