From 67cc8703fc70c5b47833f18386ef60fe9ee98b7d Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Fri, 12 Aug 2016 11:23:13 +0200 Subject: [PATCH] chat - disable apache and use nginx --- customer/pixelpark/chat01.pixelpark.com.yaml | 31 ++++---------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/customer/pixelpark/chat01.pixelpark.com.yaml b/customer/pixelpark/chat01.pixelpark.com.yaml index b4fe1b5f..63d0137a 100644 --- a/customer/pixelpark/chat01.pixelpark.com.yaml +++ b/customer/pixelpark/chat01.pixelpark.com.yaml @@ -1,13 +1,13 @@ --- site::role: base site::additional_classes: -# - nginx - - site::profile::apache - - repo::redhat::passenger - - apache::mod::passenger + - nginx +# - site::profile::apache +# - repo::redhat::passenger +# - apache::mod::passenger nginx::nginx_vhosts: - mattermost: + rocket-chat: server_name: - chat.pixelpark.com - chat01.pixelpark.com @@ -15,25 +15,6 @@ nginx::nginx_vhosts: ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem rewrite_to_https: true - proxy: http://127.0.0.1:8065 - proxy_set_header: - - 'Upgrade $http_upgrade' - - 'Connection "upgrade"' - - 'Host $host' - - 'X-Real-IP $remote_addr' - - 'X-Forwarded-Proto "https"' - - 'X-Forwarded-For $proxy_add_x_forwarded_for' - - 'X-Forwarded-Proto $scheme' - - 'X-Frame-Options SAMEORIGIN' - - 'X-Forwarded-Ssl on' - client_max_body_size: '50m' - rocket-chat: - server_name: - - chat-rocket.pixelpark.com - ssl: true - ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem - ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem - rewrite_to_https: true proxy: http://127.0.0.1:3000 proxy_set_header: - 'Upgrade $http_upgrade' @@ -50,7 +31,7 @@ nginx::nginx_vhosts: site::profile::apache::pp_vhosts: rocket: docroot: '/opt/Rocket.Chat/bundle/public' - servername: chat-rocket.pixelpark.com + servername: chat.pixelpark.com ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem' ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' -- 2.39.5