Added installation support for mod_pagespeed on RedHat

This commit is contained in:
Carlo Vollebregt 2015-11-19 22:04:03 +01:00
parent 939011c4f2
commit a3885e6d69
3 changed files with 7 additions and 6 deletions

View File

@ -68,7 +68,7 @@ Enables the Apache module mod_headers. (Debian Only)
``apache.mod_pagespeed`` ``apache.mod_pagespeed``
------------------------ ------------------------
Installs and Enables the mod_pagespeed module. (Debian Only) Installs and Enables the mod_pagespeed module. (Debian and RedHat Only)
``apache.mod_php5`` ``apache.mod_php5``
------------------- -------------------

View File

@ -9,6 +9,7 @@
'mod_wsgi': 'libapache2-mod-wsgi', 'mod_wsgi': 'libapache2-mod-wsgi',
'mod_php5': 'libapache2-mod-php5', 'mod_php5': 'libapache2-mod-php5',
'mod_fcgid': 'libapache2-mod-fcgid', 'mod_fcgid': 'libapache2-mod-fcgid',
'mod_pagespeed_source': 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_amd64.deb',
'vhostdir': '/etc/apache2/sites-available', 'vhostdir': '/etc/apache2/sites-available',
'confdir': '/etc/apache2/conf.d', 'confdir': '/etc/apache2/conf.d',
@ -26,6 +27,7 @@
'mod_wsgi': 'mod_wsgi', 'mod_wsgi': 'mod_wsgi',
'mod_php5': 'php', 'mod_php5': 'php',
'mod_pagespeed_source': 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm',
'vhostdir': '/etc/httpd/vhosts.d', 'vhostdir': '/etc/httpd/vhosts.d',
'confdir': '/etc/httpd/conf.d', 'confdir': '/etc/httpd/conf.d',

View File

@ -1,4 +1,3 @@
{% if grains['os_family']=="Debian" %}
{% from "apache/map.jinja" import apache with context %} {% from "apache/map.jinja" import apache with context %}
include: include:
@ -8,9 +7,9 @@ libapache2-mod-pagespeed:
pkg: pkg:
- installed - installed
- sources: - sources:
- mod-pagespeed-stable: https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_amd64.deb - mod-pagespeed-stable: {{ apache.mod_pagespeed_source }}
{% if grains['os_family']=="Debian" %}
a2enmod pagespeed: a2enmod pagespeed:
cmd.run: cmd.run:
- unless: ls /etc/apache2/mods-enabled/pagespeed.load - unless: ls /etc/apache2/mods-enabled/pagespeed.load
@ -19,7 +18,7 @@ a2enmod pagespeed:
- pkg: libapache2-mod-pagespeed - pkg: libapache2-mod-pagespeed
- watch_in: - watch_in:
- service: apache - service: apache
{% endif %}
{% for dir in ['/var/cache/mod_pagespeed', '/var/log/pagespeed'] %} {% for dir in ['/var/cache/mod_pagespeed', '/var/log/pagespeed'] %}
{{ dir }}: {{ dir }}:
@ -34,6 +33,7 @@ a2enmod pagespeed:
- group: {{ salt['pillar.get']('apache:group', 'www-data') }} - group: {{ salt['pillar.get']('apache:group', 'www-data') }}
{% endfor %} {% endfor %}
{% if grains['os_family']=="Debian" %}
# Here we hardcode a logrotate entry to take care of the logs # Here we hardcode a logrotate entry to take care of the logs
/etc/logrorate.d/pagespeed: /etc/logrorate.d/pagespeed:
file: file:
@ -53,5 +53,4 @@ a2enmod pagespeed:
fi; fi;
endscript endscript
} }
{% endif %} {% endif %}