Ossi Salmi
|
49a8ae3004
|
Merge branch 'puppet3'
Conflicts:
ntpd/templates/ntp.conf.erb
wiki/templates/collab-wsgi.conf.erb
|
2013-05-24 10:10:57 +03:00 |
|
Ossi Salmi
|
abeec5851d
|
wiki: Added maximum-requests option for collab wsgi daemon
|
2013-05-10 21:42:32 +03:00 |
|
Ossi Salmi
|
dc51af1ca2
|
Updated all templates to use instance variables
|
2013-05-05 00:07:55 +03:00 |
|
Ossi Salmi
|
2e4349633f
|
wiki::collab: Determine number of collab WSGI daemons from processorcount
|
2013-04-16 15:44:46 +03:00 |
|
Ossi Salmi
|
1098468803
|
wiki::collab: Added optional support for WSGI daemon mode
|
2013-04-16 15:37:50 +03:00 |
|