Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

put in web-data-analysis changes to get proxies to work

Browse source
This commit is contained in:
Stephen Smoogen 2020-07-31 11:08:39 -04:00
parent d65d8c9faf
commit 5f7864f24f
6 changed files with 14 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

13
playbooks/include/proxies-reverseproxy.yml
View file

@ -439,6 +439,13 @@
# Talk directly to the app server, not haproxy # Talk directly to the app server, not haproxy
proxyurl: http://log01 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 ### entries for resultsdb and resultsdb_frontend
- role: httpd/reverseproxy - role: httpd/reverseproxy
website: taskotron.fedoraproject.org website: taskotron.fedoraproject.org
@ -679,9 +686,3 @@
keephost: true keephost: true
tags: fpdc tags: fpdc
- role: httpd/reverseproxy
website: data-analysis.fedoraproject.org
destname: awstats
remotepath: /
localpath: /
proxyurl: http://data-analysis01.{{ datacenter }}.fedoraproject.org

51
roles/web-data-analysis/files/html/awstats-index.html
View file

@ -1,51 +0,0 @@
<html lang="en-US">
<head>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<!-- Tell IE to use its latest mode. Need to put line right after
head or it will not work in some versions.
-->
<meta charset="UTF-8"> <!-- We will try use full 8 bit UTF -->
<meta name="description" content="Template page for level 00">
<meta name="robots" content="index,follow">
<!-- Try to make the page responsive to the device -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Open Graph Protocol Mapping -->
<meta property="og:type" content="website" />
<meta property="og:title" content="Stephen Smoogen" />
<meta property="og:locale" content="en_US" />
<!-- Links for microformat data -->
<link rel="author" href="mailto:smooge@fedoraproject.org">
<link rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
<!-- Links for style sheets -->
<link rel="SHORTCUT ICON" href="../images/favicon.ico">
<link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css">
<link rel="stylesheet" type="text/css" media="screen" href="/css/awstats-reports.css">
<!-- Links for JavaScript -->
<!-- Title of the webpage -->
<title>AWStats Reports</title>
</head>
<body>
<h1>Index by Year</h1>
<ul>
<li><a href="2007/index.html">Reports for 2007</a></li>
<li><a href="2008/index.html">Reports for 2008</a></li>
<li><a href="2009/index.html">Reports for 2009</a></li>
<li><a href="2010/index.html">Reports for 2010</a></li>
<li><a href="2011/index.html">Reports for 2011</a></li>
<li><a href="2012/index.html">Reports for 2012</a></li>
<li><a href="2013/index.html">Reports for 2013</a></li>
<li><a href="2014/index.html">Reports for 2014</a></li>
<li><a href="2015/index.html">Reports for 2015</a></li>
<li><a href="2016/index.html">Reports for 2016</a></li>
<li><a href="2017/index.html">Reports for 2017</a></li>
<li><a href="2018/index.html">Reports for 2018</a></li>
<li><a href="2019/index.html">Reports for 2019</a></li>
</ul>
</body>
</html>

0
roles/web-data-analysis/files/html/css/awstats-reports.css → roles/web-data-analysis/files/html/css/data-reports.css
View file

3
roles/web-data-analysis/files/html/main-index.html
View file

@ -23,7 +23,7 @@
<!-- Links for style sheets --> <!-- Links for style sheets -->
<link rel="SHORTCUT ICON" href="../images/favicon.ico"> <link rel="SHORTCUT ICON" href="../images/favicon.ico">
<link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css"> <link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css">
<link rel="stylesheet" type="text/css" media="screen" href="/css/awstats-reports.css"> <link rel="stylesheet" type="text/css" media="screen" href="/css/data-reports.css">
</head> </head>
<body> <body>
<h1>What we have</h1> <h1>What we have</h1>
@ -31,7 +31,6 @@
<li><a href="csv-reports/">CSV Data</a></li> <li><a href="csv-reports/">CSV Data</a></li>
<li><a href="csv-reports/images/">Images from that CSV data</a></li> <li><a href="csv-reports/images/">Images from that CSV data</a></li>
<li><a href="csv-reports/images/summary.html">Particular images</a></li> <li><a href="csv-reports/images/summary.html">Particular images</a></li>
<li><a href="awstats-reports/index.html">Awstats of Fedora websites</a></li>
</ul> </ul>
</body> </body>
</html> </html>

11
roles/web-data-analysis/files/html/summary.html
View file

@ -22,21 +22,20 @@
<!-- Links for style sheets --> <!-- Links for style sheets -->
<link rel="SHORTCUT ICON" href="../images/favicon.ico"> <link rel="SHORTCUT ICON" href="../images/favicon.ico">
<link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css"> <link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css">
<link rel="stylesheet" type="text/css" media="screen" href="/css/awstats-reports.css"> <link rel="stylesheet" type="text/css" media="screen" href="/css/data-reports.css">
<style>img { width: 100%; margin-bottom: 10% }</style> <style>img { width: 100%; margin-bottom: 10% }</style>
</head> </head>
<body> <body>
<img src="fedora-os-latest-ma.png"/> <img src="fedora-os-latest-ma.png"/>
<img src="hotspot-all-ma.png"/>
<img src="fedora-os-latest.png"/> <img src="fedora-os-latest.png"/>
<img src="fedora-os-latest-stacked-ma.png"/> <img src="fedora-os-latest-stacked-ma.png"/>
<img src="getfedora-editions.png"/> <!-- <img src="getfedora-editions.png"/> -->
<img src="getfedora-netinstalls.png"/> <!-- <img src="getfedora-netinstalls.png"/> -->
<!-- <img src="getfedora-versions-filled.png"/> -->
<img src="getfedora-versions-filled.png"/> <!-- <img src="hotspot-all-ma.png"/> -->
<img src="fedora-os-all-ma.png"/> <img src="fedora-os-all-ma.png"/>
<img src="fedora-stacked.png"/> <img src="fedora-stacked.png"/>

16
roles/web-data-analysis/tasks/main.yml
View file

@ -34,17 +34,7 @@
- name: css files - name: css files
copy: src={{item}} dest=/var/www/html/css/ mode=0644 copy: src={{item}} dest=/var/www/html/css/ mode=0644
with_items: [ html/css/awstats-reports.css, html/css/normalize.css ] with_items: [ html/css/data-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
tags: tags:
- web-data - web-data
@ -95,7 +85,3 @@
- web-data - web-data
- cron - 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