Mercurial > repos > other > Puppet
changeset 58:65b227da8dc2 puppet-3.6
Merge Default again
(Because somehow the last one wasn't the latest default,
even though I did "hg pull -u" just before the merge)
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 26 Jul 2015 17:58:06 +0100 |
| parents | 3674aac72674 (current diff) bddd6c3a3e8c (diff) |
| children | c2f66d0f2a43 |
| files | manifests/templates.pp modules/website/files/zzz-custom.conf modules/website/manifests/mysql.pp |
| diffstat | 5 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/common/logrotate-trac Sun Jul 26 17:55:43 2015 +0100 +++ b/common/logrotate-trac Sun Jul 26 17:58:06 2015 +0100 @@ -2,6 +2,6 @@ weekly rotate 7 missingok - create 640 www-data www-data + create 640 apache apache compress }
--- a/manifests/templates.pp Sun Jul 26 17:55:43 2015 +0100 +++ b/manifests/templates.pp Sun Jul 26 17:58:06 2015 +0100 @@ -475,6 +475,7 @@ # http://en.wikipedia.org/wiki/Server_Name_Indication#No_support priority => 1, custom_fragment => template("private/apache/dev.fragment"), + force_no_index => false, } } class glittergothsite {
--- a/modules/postfix/templates/main.cf.erb Sun Jul 26 17:55:43 2015 +0100 +++ b/modules/postfix/templates/main.cf.erb Sun Jul 26 17:58:06 2015 +0100 @@ -60,7 +60,7 @@ smtpd_helo_required = yes smtpd_helo_restrictions = permit_mynetworks, reject_invalid_helo_hostname, check_helo_access hash:/etc/postfix/helo_whitelist, reject_rhsbl_helo zen.spamhaus.org, permit smtpd_sender_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_non_fqdn_sender, reject_unknown_sender_domain, permit -smtpd_recipient_restrictions = reject_invalid_hostname, reject_non_fqdn_sender, reject_non_fqdn_recipient, reject_unknown_sender_domain, permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, check_sender_access hash:/etc/postfix/sender_access, check_recipient_access hash:/etc/postfix/valias-blacklist, check_recipient_access regexp:/etc/postfix/valias-blacklist-regex, reject_rbl_client zen.spamhaus.org, reject_rbl_client b.barracudacentral.org, check_policy_service unix:private/policy +smtpd_recipient_restrictions = reject_invalid_hostname, reject_non_fqdn_sender, reject_non_fqdn_recipient, reject_unknown_sender_domain, permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, check_sender_access hash:/etc/postfix/sender_access, check_recipient_access hash:/etc/postfix/valias-blacklist, check_recipient_access regexp:/etc/postfix/valias-blacklist-regex, reject_rbl_client zen.spamhaus.org, check_policy_service unix:private/policy smtpd_data_restrictions = reject_unauth_pipelining transport_maps = hash:/etc/postfix/transport message_size_limit = 15000000
--- a/modules/website/files/zzz-custom.conf Sun Jul 26 17:55:43 2015 +0100 +++ b/modules/website/files/zzz-custom.conf Sun Jul 26 17:58:06 2015 +0100 @@ -11,6 +11,7 @@ ExpiresByType image/gif "access plus 2 weeks" ExpiresByType image/png "access plus 2 weeks" ExpiresByType text/css "access plus 1 week" +ExpiresByType text/javascript "access plus 1 month" ExpiresByType application/javascript "access plus 1 month" ExpiresByType application/x-javascript "access plus 1 month" ExpiresByType image/x-icon "access plus 1 month" @@ -20,6 +21,7 @@ AddOutputFilterByType DEFLATE text/html AddOutputFilterByType DEFLATE text/xml AddOutputFilterByType DEFLATE text/css + AddOutputFilterByType DEFLATE text/javascript AddOutputFilterByType DEFLATE application/xml AddOutputFilterByType DEFLATE application/xhtml+xml AddOutputFilterByType DEFLATE application/rss+xml
--- a/modules/website/manifests/mysql.pp Sun Jul 26 17:55:43 2015 +0100 +++ b/modules/website/manifests/mysql.pp Sun Jul 26 17:58:06 2015 +0100 @@ -18,11 +18,11 @@ package_name => "${mysqlprefix}${mysqlsuffix}-server", override_options => { 'mysqld' => { - 'query_cache_size' => '32M', + 'query_cache_size' => '64M', 'join_buffer_size' => '524288', #512K 'tmp_table_size' => '64M', 'max_heap_table_size' => '64M', - 'table_open_cache' => '500', + 'table_open_cache' => '64', 'log-queries-not-using-indexes' => '1', } },