opendev/system-config
Code Issues Proposed changes

Merge "Revert "Generate list of 404s for docs.o.o""

Browse Source
This commit is contained in:
Zuul 2020-02-25 23:39:02 +00:00 committed by Gerrit Code Review
commit 9566bd0e2a
3 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/openstack_project/files/files/404s.sh
View File

@ -1,21 +0,0 @@
#!/bin/bash
SOURCE_FILE=$1
OUTPUT_DIR=$2
INTERMEDIATE_FILE=$(mktemp)
# Get just the lines with 404s in them
grep ' 404 ' $SOURCE_FILE | sed -n -e 's/.*"GET \(\/.*\) HTTP\/1\.." 404 .*/\1/p' > $INTERMEDIATE_FILE
if [ -f "$SOURCE_FILE.1" ] ; then
# We get roughly the last day's worth of logs by looking at the last two
# log files.
grep ' 404 ' $SOURCE_FILE.1 | sed -n -e 's/.*"GET \(\/.*\) HTTP\/1\.." 404 .*/\1/p' >> $INTERMEDIATE_FILE
fi
# Process those 404s to count them and return sorted by count
sort $INTERMEDIATE_FILE | uniq -c | sort -rn | grep '\(html\|\/$\)' > $OUTPUT_DIR/$(date +%F).txt
# cleanup
rm $INTERMEDIATE_FILE
find $OUTPUT_DIR -type f -name '*.txt' -mtime +30 -delete

23
modules/openstack_project/manifests/files.pp
View File

@ -124,28 +124,6 @@ class openstack_project::files (
notify => Service['httpd'], notify => Service['httpd'],
} }
file {'/usr/local/bin/404s.sh':
ensure => present,
owner => 'root',
group => 'root',
mode => '0755',
source => 'puppet:///modules/openstack_project/files/404s.sh',
}
file {'/var/www/docs-404s':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}
cron {'generate_docs_404s':
# This seems to be about half an hour after apache rotates logs.
hour => '7',
minute => '0',
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',
command => '404s.sh /var/log/apache2/docs.openstack.org_access.log /var/www/docs-404s/',
require => File['/usr/local/bin/404s.sh'],
}
########################################################### ###########################################################
# docs.openstack.org # docs.openstack.org
@ -181,7 +159,6 @@ class openstack_project::files (
before => File['/etc/ssl/certs/docs.openstack.org.pem'], before => File['/etc/ssl/certs/docs.openstack.org.pem'],
} }
########################################################### ###########################################################
# developer.openstack.org # developer.openstack.org

6
modules/openstack_project/templates/files.vhost.erb
View File

@ -23,12 +23,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
Require all granted Require all granted
</Directory> </Directory>
Alias /docs-404s /var/www/docs-404s
<Directory "/var/www/docs-404s">
Options +Indexes
Require all granted
</Directory>
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined