]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
chat - disable apache and use nginx
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Fri, 12 Aug 2016 09:23:13 +0000 (11:23 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Fri, 12 Aug 2016 09:23:13 +0000 (11:23 +0200)
customer/pixelpark/chat01.pixelpark.com.yaml

index b4fe1b5f6fbead38c723c7ec1145a7ab78d97ef6..63d0137a92c910f72e3d40b66d4b61592a8bf84c 100644 (file)
@@ -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'