From nobody Fri Apr 19 07:18:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of ovirt.org designates 66.187.230.42 as permitted sender) client-ip=66.187.230.42; envelope-from=kimchi-devel-bounces@ovirt.org; helo=lists.ovirt.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of ovirt.org designates 66.187.230.42 as permitted sender) smtp.mailfrom=kimchi-devel-bounces@ovirt.org; Return-Path: Received: from lists.ovirt.org (lists.phx.ovirt.org [66.187.230.42]) by mx.zohomail.com with SMTPS id 149017185976738.95355423752005; Wed, 22 Mar 2017 01:37:39 -0700 (PDT) Received: from lists.phx.ovirt.org (localhost [127.0.0.1]) by lists.ovirt.org (Postfix) with ESMTP id 011968206E0; Wed, 22 Mar 2017 08:37:38 +0000 (UTC) Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) by lists.ovirt.org (Postfix) with ESMTPS id 872D68205E4 for ; Wed, 22 Mar 2017 08:37:14 +0000 (UTC) Received: from laptop.vms (mhy71-2-88-167-63-197.fbx.proxad.net [88.167.63.197]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Wed, 22 Mar 2017 09:17:11 +0100 X-Original-To: kimchi-devel@ovirt.org X-Greylist: delayed 1201 seconds by postgrey-1.34 at lists.phx.ovirt.org; Wed, 22 Mar 2017 08:37:14 UTC From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= To: kimchi-devel@ovirt.org Date: Wed, 22 Mar 2017 09:17:04 +0100 Message-Id: <20170322081704.3355-1-cbosdonnat@suse.com> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 Subject: [Kimchi-devel] [PATCH] Add apache configuration X-BeenThere: kimchi-devel@ovirt.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: kimchi-devel-bounces@ovirt.org Errors-To: kimchi-devel-bounces@ovirt.org X-ZohoMail: RSF_0 Z_629925259 SPT_0 Provide an apache2 virtual host configuration in contrib. With this, the user can choose to use either nginx or apache as a proxy. The reason why the configuration has been added to contrib rather than src/apache2 to mimic the nginx config, is that there is no distro with the same apache2 config layout than others. Also add Wants and After for apache2 in the systemd unit file. Signed-off-by: C=C3=A9dric Bosdonnat --- contrib/wok.conf.apache | 34 ++++++++++++++++++++++++++++++++++ contrib/wokd.service.systemd | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 contrib/wok.conf.apache diff --git a/contrib/wok.conf.apache b/contrib/wok.conf.apache new file mode 100644 index 00000000..c7e650ee --- /dev/null +++ b/contrib/wok.conf.apache @@ -0,0 +1,34 @@ +Listen 8001 +Listen 8000 + + + ErrorLog /var/log/apache2/error_log + TransferLog /var/log/apache2/access_log + + Timeout 600 + LimitRequestBody 4294967296 + + SSLEngine on + SSLCertificateFile /etc/wok/wok-cert.pem + SSLCertificateKeyFile /etc/wok/wok-key.pem + SSLOpenSSLConfCmd DHParameters /etc/wok/dhparams.pem + SSLSessionCacheTimeout 600 + + RewriteEngine On + RewriteCond %{HTTP:Upgrade} =3Dwebsocket [NC] + RewriteRule /(.*) ws://localhost:64667/$1 [P,L] + + ProxyPass /websockify http://127.0.0.1:64667/websockify + ProxyPassReverse /websockify http://127.0.0.1:64667/websockify + + ProxyPass / http://127.0.0.1:8010/ + ProxyPassReverse / http://127.0.0.1:8010/ + + + + ErrorLog /var/log/apache2/error_log + TransferLog /var/log/apache2/access_log + + RewriteEngine On + RewriteRule ^/(.*)$ https://localhost:8001/$1 [R] + diff --git a/contrib/wokd.service.systemd b/contrib/wokd.service.systemd index 621be601..eba80a9d 100644 --- a/contrib/wokd.service.systemd +++ b/contrib/wokd.service.systemd @@ -3,6 +3,8 @@ Description=3DWok - Webserver Originated from Kimchi Documentation=3Dhttps://github.com/kimchi-project/wok/wiki Wants=3Dnginx.service After=3Dnginx.service +Wants=3Dapache2.service +After=3Dapache2.service =20 [Service] Type=3Dsimple --=20 2.12.0 _______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel