From 49169e9a0161e8a82e084999cb014495ba08a2fd Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 11 Oct 2022 18:12:00 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/cherokee-server | 1 + config/cherokee/cherokee.conf | 29 ++++++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bin/cherokee-server b/bin/cherokee-server index bc1573d..20a55e8 100755 --- a/bin/cherokee-server +++ b/bin/cherokee-server @@ -12,6 +12,7 @@ if [ ! -d "/config/cherokee" ] && [ -d "/usr/local/share/template-files/config/c cp -Rf "/usr/local/share/template-files/config/cherokee/." "/config/cherokee/" fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +[ -d "/data/cherokee/graphs" ] || mkdir -p "/data/cherokee/graphs" [ -d "/config/cherokee" ] && cp -Rf "/config/cherokee/." "/etc/cherokee/" || cp -Rf "/usr/local/share/template-files/config/defaults/cherokee/" "/etc/cherokee/" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ -d "/data/htdocs" ] || mkdir -p "/data/htdocs" diff --git a/config/cherokee/cherokee.conf b/config/cherokee/cherokee.conf index dfcf3d1..6b0c430 100644 --- a/config/cherokee/cherokee.conf +++ b/config/cherokee/cherokee.conf @@ -1,47 +1,47 @@ config!version = 001002104 server!bind!1!port = 80 -server!bind!2!port = 443 -server!bind!2!tls = 1 -server!ipv6 = 1 +server!collector = rrd server!keepalive = 1 server!keepalive_max_requests = 500 -server!panic_action = /usr/bin/cherokee-panic +server!panic_action = /usr/local/share/cherokee/bin/cherokee-panic server!pid_file = /tmp/cherokee.pid -server!server_tokens = full +server!post_track = post_track +server!server_tokens = product server!timeout = 15 -server!tls = libssl -server!tls!protocol!SSLv3 = 0 vserver!1!directory_index = index.html vserver!1!document_root = /data/htdocs/www vserver!1!error_writer!filename = /dev/stderr vserver!1!error_writer!type = file +vserver!1!evhost = evhost +vserver!1!evhost!tpl_document_root = /data/htdocs/www/${domain} vserver!1!logger = combined vserver!1!logger!access!buffsize = 16384 -vserver!1!logger!access!filename = /dev/stdout +vserver!1!logger!access!filename = /usr/local/share/cherokee/var/log/cherokee.access vserver!1!logger!access!type = file +vserver!1!logger!x_real_ip_access = 0.0.0.0 +vserver!1!logger!x_real_ip_access_all = 0 +vserver!1!logger!x_real_ip_enabled = 1 vserver!1!nick = default vserver!1!rule!5!encoder!gzip = allow vserver!1!rule!5!handler = server_info vserver!1!rule!5!handler!type = just_about vserver!1!rule!5!match = directory vserver!1!rule!5!match!directory = /about -vserver!1!rule!4!document_root = /data/htdocs/cgi-bin +vserver!1!rule!4!document_root = /usr/local/share/cherokee/lib/cgi-bin vserver!1!rule!4!handler = cgi vserver!1!rule!4!match = directory vserver!1!rule!4!match!directory = /cgi-bin -vserver!1!rule!3!document_root = /config/cherokee/themes +vserver!1!rule!3!document_root = /usr/local/share/cherokee/share/cherokee/themes vserver!1!rule!3!handler = file vserver!1!rule!3!match = directory vserver!1!rule!3!match!directory = /cherokee_themes -vserver!1!rule!2!document_root = /usr/local/share/cherokee/icons +vserver!1!rule!2!document_root = /usr/local/share/cherokee/share/cherokee/icons vserver!1!rule!2!handler = file vserver!1!rule!2!match = directory vserver!1!rule!2!match!directory = /cherokee_icons vserver!1!rule!1!handler = common vserver!1!rule!1!handler!iocache = 1 vserver!1!rule!1!match = default -vserver!1!ssl_certificate_file = /config/ssl//localhost.crt -vserver!1!ssl_certificate_key_file = /config/ssl//localhost.key icons!default = page_white.png icons!directory = folder.png icons!file!bomb.png = core @@ -297,5 +297,4 @@ mime!video/x-ms-wvx!extensions = wvx mime!video/x-msvideo!extensions = avi mime!video/x-sgi-movie!extensions = movie mime!x-conference/x-cooltalk!extensions = ice -mime!x-world/x-vrml!extensions = vrm,vrml,wrl - +mime!x-world/x-vrml!extensions = vrm,vrml,wrl \ No newline at end of file