Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Move yubikey from httpd.worker to prefork

Browse source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2019-05-12 21:32:54 +02:00
parent ce69ca3a1a
commit 60c13450de
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
roles/yubikey/templates/configmap.yml
View file

@ -14,7 +14,7 @@ data:
ln -s /etc/httpd/modules /httpdir/modules ln -s /etc/httpd/modules /httpdir/modules
truncate --size=0 /httpdir/accesslog /httpdir/errorlog truncate --size=0 /httpdir/accesslog /httpdir/errorlog
tail -qf /httpdir/accesslog /httpdir/errorlog & tail -qf /httpdir/accesslog /httpdir/errorlog &
exec /usr/sbin/httpd.worker -f /etc/yubikey/httpd.conf -DFOREGROUND -DNO_DETACH exec /usr/sbin/httpd -f /etc/yubikey/httpd.conf -DFOREGROUND -DNO_DETACH
httpd.conf: |- httpd.conf: |-
Listen 0.0.0.0:8080 Listen 0.0.0.0:8080
ServerRoot "/httpdir" ServerRoot "/httpdir"
@ -33,18 +33,17 @@ data:
LoadModule dir_module modules/mod_dir.so LoadModule dir_module modules/mod_dir.so
LoadModule alias_module modules/mod_alias.so LoadModule alias_module modules/mod_alias.so
LoadModule version_module modules/mod_version.so LoadModule version_module modules/mod_version.so
LoadModule php5_module modules/libphp5-zts.so LoadModule php5_module modules/libphp5.so
AddHandler php5-script .php AddHandler php5-script .php
AddType text/html .php AddType text/html .php
DirectoryIndex index.php DirectoryIndex index.php
StartServers 4 StartServers 20
MaxClients 300 ServerLimit 100
MinSpareThreads 25 MaxRequestsPerChild 2000
MaxSpareThreads 75 MaxRequestWorkers 100
ThreadsPerChild 25
MaxRequestsPerChild 0
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
CustomLog /httpdir/accesslog combined CustomLog /httpdir/accesslog combined
ErrorLog /httpdir/errorlog ErrorLog /httpdir/errorlog