Tomas Cohen Arazi
ea5ec8c4d5
This patch removes Memcached configurations from the shipped apache files. Note: testing is not actually needed for this patch, as it is really trivial. But I include testing steps, just in case QA members require it. To test: - Apply the patch - Do a (standard/dev/single) Koah install => SUCCESS: Verify the resulting koha-httpd.conf file doens't include memcached data - Have a packages install - Replace * /etc/koha/apache-site-https.conf.in * /etc/koha/apache-site.conf.in with the ones from this patch - Create an instance => SUCCESS: The apache configuration doesn't include memcached configurations - Sign off :-D Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
66 lines
2.6 KiB
Text
66 lines
2.6 KiB
Text
# Koha instance __KOHASITE__ Apache config.
|
|
|
|
# redirect http to https
|
|
#<VirtualHost *:80> #nohttps
|
|
# ServerName __OPACSERVER__ #nohttps
|
|
# ServerAlias __INTRASERVER__ #nohttps
|
|
# RewriteEngine On #nohttps
|
|
# RewriteCond %{HTTPS} !=on #nohttps
|
|
# RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] #nohttps
|
|
#</VirtualHost> #nohttps
|
|
|
|
# OPAC
|
|
<VirtualHost *:80> #https
|
|
# SSLEngine on
|
|
# SSLProtocol +TLSv1.2 +TLSv1.1 +TLSv1
|
|
# SSLCompression off
|
|
# SSLHonorCipherOrder on
|
|
# SSLCipherSuite "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-SA-
|
|
# SSLCertificateKeyFile /etc/letsencrypt/live/__OPACSERVER__/privkey.pem
|
|
# SSLCertificateFile /etc/letsencrypt/live/__OPACSERVER__/cert.pem
|
|
# SSLCertificateChainFile /etc/letsencrypt/live/__OPACSERVER__/chain.pem
|
|
|
|
<IfVersion >= 2.4>
|
|
Define instance "__KOHASITE__"
|
|
</IfVersion>
|
|
Include /etc/koha/apache-shared.conf
|
|
# Include /etc/koha/apache-shared-disable.conf
|
|
# Include /etc/koha/apache-shared-opac-plack.conf
|
|
Include /etc/koha/apache-shared-opac.conf
|
|
|
|
ServerName __OPACSERVER__
|
|
SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
|
|
AssignUserID __UNIXUSER__ __UNIXGROUP__
|
|
|
|
ErrorLog /var/log/koha/__KOHASITE__/opac-error.log
|
|
# TransferLog /var/log/koha/__KOHASITE__/opac-access.log
|
|
# RewriteLog /var/log/koha/__KOHASITE__/opac-rewrite.log
|
|
</VirtualHost>
|
|
|
|
# Intranet
|
|
<VirtualHost *:80> #https
|
|
# SSLEngine on
|
|
# SSLProtocol +TLSv1.2 +TLSv1.1 +TLSv1
|
|
# SSLCompression off
|
|
# SSLHonorCipherOrder on
|
|
# SSLCipherSuite "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES
|
|
# SSLCertificateKeyFile /etc/letsencrypt/live/__OPACSERVER__/privkey.pem
|
|
# SSLCertificateFile /etc/letsencrypt/live/__OPACSERVER__/cert.pem
|
|
# SSLCertificateChainFile /etc/letsencrypt/live/__OPACSERVER__/chain.pem
|
|
|
|
<IfVersion >= 2.4>
|
|
Define instance "__KOHASITE__"
|
|
</IfVersion>
|
|
Include /etc/koha/apache-shared.conf
|
|
# Include /etc/koha/apache-shared-disable.conf
|
|
# Include /etc/koha/apache-shared-intranet-plack.conf
|
|
Include /etc/koha/apache-shared-intranet.conf
|
|
|
|
ServerName __INTRASERVER__
|
|
SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
|
|
AssignUserID __UNIXUSER__ __UNIXGROUP__
|
|
|
|
ErrorLog /var/log/koha/__KOHASITE__/intranet-error.log
|
|
# TransferLog /var/log/koha/__KOHASITE__/intranet-access.log
|
|
# RewriteLog /var/log/koha/__KOHASITE__/intranet-rewrite.log
|
|
</VirtualHost>
|