From 4cde137b5447b9b17991391223070930ca1a48d3 Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Wed, 21 Dec 2016 11:46:52 +0100 Subject: [PATCH] Revert "[ADD]Hiisama images and definition for host" This reverts commit 2bd79cf16368e43804bd1635599c4546b8cf650c. --- hosts/hiisama/docker-compose.yml | 12 ---- hosts/hiisama/nginx/Dockerfile | 5 -- hosts/hiisama/nginx/hiisama-odoo.conf | 85 --------------------------- 3 files changed, 102 deletions(-) delete mode 100644 hosts/hiisama/docker-compose.yml delete mode 100644 hosts/hiisama/nginx/Dockerfile delete mode 100644 hosts/hiisama/nginx/hiisama-odoo.conf diff --git a/hosts/hiisama/docker-compose.yml b/hosts/hiisama/docker-compose.yml deleted file mode 100644 index 2dd8dac..0000000 --- a/hosts/hiisama/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -# Hiisama own images -version: '2' - -services: - - # Proxy - nginx: - extends: - file: ../../nginx/base.yml - service: nginx - build: ./nginx - image: registry.yaltik.net/nginx:hiisama diff --git a/hosts/hiisama/nginx/Dockerfile b/hosts/hiisama/nginx/Dockerfile deleted file mode 100644 index 493543b..0000000 --- a/hosts/hiisama/nginx/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM registry.yaltik.net/nginx:yaltik -MAINTAINER Yaltik - Fabien Bourgeois - -# Copy templates and usefull files -COPY hiisama-odoo.conf /etc/nginx/templates/ diff --git a/hosts/hiisama/nginx/hiisama-odoo.conf b/hosts/hiisama/nginx/hiisama-odoo.conf deleted file mode 100644 index ad9de6b..0000000 --- a/hosts/hiisama/nginx/hiisama-odoo.conf +++ /dev/null @@ -1,85 +0,0 @@ -# GOLEM -upstream ${GOLEM_SERVICE}server { - server ${GOLEM_SERVICE}:8069 fail_timeout=300s; -} - -upstream ${GOLEM_SERVICE}longpoll { - server ${GOLEM_SERVICE}:8072 fail_timeout=300s; -} - -server { - listen 80; - server_name ${GOLEM_SERVER_NAMES}; - return 301 https://${DOLLSIGN}host${DOLLSIGN}request_uri; -} - -server { - listen 443 ssl; - server_name ${GOLEM_SERVER_NAMES}; - client_max_body_size 200M; - gzip on; - gzip_min_length 256; - gzip_types text/plain application/x-javascript application/json text/xml text/css; - location / { - proxy_pass http://${GOLEM_SERVICE}server; - proxy_http_version 1.1; - proxy_read_timeout 300; - proxy_set_header Host ${DOLLSIGN}http_host; - proxy_set_header X-Real-IP ${DOLLSIGN}remote_addr; - proxy_set_header X-Forward-For ${DOLLSIGN}proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header X-Forwarded-Host ${DOLLSIGN}http_host; - proxy_redirect off; - } - location /longpolling { - proxy_pass http://${GOLEM_SERVICE}longpoll; - proxy_set_header Host ${DOLLSIGN}http_host; - proxy_set_header X-Real-IP ${DOLLSIGN}remote_addr; - proxy_set_header X-Forward-For ${DOLLSIGN}proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header X-Forwarded-Host ${DOLLSIGN}http_host; - proxy_redirect off; - } -} - -# Odoov10 -upstream ${ODOO10_SERVICE}server { - server ${ODOO10_SERVICE}:8069 fail_timeout=300s; -} - -upstream ${ODOO10_SERVICE}longpoll { - server ${ODOO10_SERVICE}:8072 fail_timeout=300s; -} - -server { - listen 80; - server_name ${ODOO10_SERVER_NAMES}; - return 301 https://${DOLLSIGN}host${DOLLSIGN}request_uri; -} - -server { - listen 443 ssl; - server_name ${ODOO10_SERVER_NAMES}; - client_max_body_size 200M; - gzip on; - gzip_min_length 256; - gzip_types text/plain application/x-javascript application/json text/xml text/css; - location / { - proxy_pass http://${ODOO10_SERVICE}server; - proxy_http_version 1.1; - proxy_read_timeout 300; - proxy_set_header Host ${DOLLSIGN}host; - proxy_set_header X-Real-IP ${DOLLSIGN}remote_addr; - proxy_set_header X-Forward-For ${DOLLSIGN}proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_redirect off; - } - location /longpolling { - proxy_pass http://${ODOO10_SERVICE}longpoll; - proxy_set_header Host ${DOLLSIGN}host; - proxy_set_header X-Real-IP ${DOLLSIGN}remote_addr; - proxy_set_header X-Forward-For ${DOLLSIGN}proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_redirect off; - } -}