summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-19fix merge regression and add data-dir back to open_basedirmh
2014-04-19lintingmh
2014-04-19Merge remote-tracking branch 'lavamind/master'mh
Conflicts: manifests/config/file.pp manifests/vhost/php/standard.pp
2014-04-19correct alignmentmh
2014-04-19introduce a simple wp-login brute force protectionmh
2014-04-19remove unnecessary new linesmh
2014-04-19combine the checks like this, otherwise we always redirect on securitymh
2014-04-18fix another deprecation warningmh
2014-04-18address puppet 3.x deprecation warningsmh
2014-04-17lintingmh
2014-04-14include fcgi config also on http although they might get redirected, because ↵mh
requests might still hit the backend plain
2014-04-14remove that extra linemh
2014-04-14fix identationmh
2014-04-14only forward on httpsmh
2014-04-14more identation fixingmh
2014-04-14cleanup identation of if then else, especially for the produced filemh
2014-04-14an initial https connection might still end up as http on the backend. in ↵mh
that case we don't want to redirect
2014-03-16make it possible that domainalias can be an arraymh
2014-02-25Merge branch 'master' of ↵root
ssh://git.cmaisonneuve.qc.ca/srv/git/public/puppet/module-apache
2014-02-25Merge branch 'riseup'Micah Anderson
2014-02-25fix merge conflict snafu introduced by:Micah Anderson
115691c87bad3f5863f088e73603133b67c9f828 this fixes the incorrectly nested case statement, and brings back the lost 'config file as link' changes
2014-02-24pass additional open_basedir paths in $php_options hash insteadJerome Charaoui
2014-02-24append to standard paths instead of overrideJerome Charaoui
2014-02-24remove safe_mode flag from defaults under Debian (removed from PHP 5.4 which ↵Jerome Charaoui
is in wheezy)
2014-02-23this is only required on debianmh
2014-02-23lintingmh
2014-02-23Merge remote-tracking branch 'shared/master'mh
Conflicts: manifests/debian.pp
2014-02-23lintingmh
2014-02-23introduce a datadir for all dynamic hostingsmh
2014-02-23lintingmh
2014-02-21enable status module on debianJerome Charaoui
2014-02-20Document templatewlv requirementJerome Charaoui
2014-02-19don't redirect https traffic terminated beforehando
2013-12-29fix typo from the latest lintingmh
2013-12-28reduce dependency on lsb modules, rather use the builtin factsmh
2013-12-16Merge branch 'master' of labs.riseup.net:module_apache into riseupMicah Anderson
2013-12-16fix $apache::no_default_site variableMicah Anderson
2013-11-09Merge remote-tracking branch 'leap/master'Gabriel Filion
2013-10-23we need to pass a second argumentmh
2013-10-09make it possible to only log error_logsmh
2013-09-18joomla requires allow_url_fopen to update itself :( ↵mh
http://docs.joomla.org/Security_Checklist/Hosting_and_Server_Setup#Use_allow_url_fopen
2013-09-12remove the variable againo
2013-09-12initialize the variableo
2013-09-12pass the php_tmp_dir option to fcgido
2013-08-13be more efficient when cleaning up the webdirectorymh
2013-06-12remove unnecessary template part from mediawikimh
we also have likely anonymization in place, hence all ips are from localhost
2013-05-19fixed typo that caused 0-default_ssl.conf to always be created.elijah
2013-04-29Merge branch 'leap' into riseupMicah Anderson
2013-04-25fix merge conflict resolution mistakeMicah Anderson
2013-04-25Merge commit 'dafb060'Micah Anderson
Conflicts: manifests/debian.pp