merge from upstream

4 files changed, 0 insertions, 133 deletions

diff --git a/app/build/sogo/Dockerfile b/app/build/sogo/Dockerfile
deleted file mode 100644
index 46880dd..0000000
--- a/app/build/sogo/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-#FROM amd64/debian:stretch as builder
-
-FROM amd64/debian:buster
-
-RUN mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
-
-RUN apt-get update && \
-    apt-get install -y apt-transport-https gnupg2 sudo nginx && \
-    rm -rf /etc/nginx/sites-enabled/* && \
-    apt-key adv --keyserver keys.gnupg.net --recv-key 0x810273C4 && \
-    echo "deb http://packages.inverse.ca/SOGo/nightly/5/debian/ buster buster" > /etc/apt/sources.list.d/sogo.list && \
-    apt-get update && \
-    apt-get install -y sogo sogo-activesync sope4.9-gdl1-postgresql postgresql-client
-
-COPY sogo.nginx.conf /etc/nginx/sites-enabled/sogo.conf
-COPY entrypoint /usr/sbin/entrypoint
-ENTRYPOINT ["/usr/sbin/entrypoint"]
diff --git a/app/build/sogo/README.md b/app/build/sogo/README.md
deleted file mode 100644
index ea12245..0000000
--- a/app/build/sogo/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-```
-docker build -t superboum/amd64_sogo:v6 .
-
-# privileged is only for debug
-docker run --rm -ti \
-  --privileged \
-  -p 8080:8080 \
-  -v /tmp/sogo/log:/var/log/sogo \
-  -v /tmp/sogo/run:/var/run/sogo \
-  -v /tmp/sogo/spool:/var/spool/sogo \
-  -v /tmp/sogo/tmp:/tmp \
-  -v `pwd`/sogo:/etc/sogo:ro \
-  superboum/amd64_sogo:v1
-```
-
-Password must be url encoded in sogo.conf for postgres
-Will need a nginx instance: http://wiki.sogo.nu/nginxSettings
-
-Might (or might not) be needed:
-traefik.frontend.headers.customRequestHeaders=x-webobjects-server-port:443||x-webobjects-server-name=sogo.deuxfleurs.fr||x-webobjects-server-url:https://sogo.deuxfleurs.fr
diff --git a/app/build/sogo/entrypoint b/app/build/sogo/entrypoint
deleted file mode 100755
index 8b39def..0000000
--- a/app/build/sogo/entrypoint
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-mkdir -p /var/log/sogo
-mkdir -p /var/run/sogo
-mkdir -p /var/spool/sogo
-chown sogo /var/log/sogo
-chown sogo /var/run/sogo
-chown sogo /var/spool/sogo
-
-nginx -g 'daemon on; master_process on;'
-sudo -u sogo memcached -d
-sudo -u sogo sogod
-sleep 10
-tail -n200 -f /var/log/sogo/sogo.log
diff --git a/app/build/sogo/sogo.nginx.conf b/app/build/sogo/sogo.nginx.conf
deleted file mode 100644
index ad920a5..0000000
--- a/app/build/sogo/sogo.nginx.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-server {
-  listen 8080;
-  server_name default_server; 
-  root /usr/lib/GNUstep/SOGo/WebServerResources/; 
-
-  ## requirement to create new calendars in Thunderbird ##
-  proxy_http_version 1.1;
-
-  # Message size limit
-  client_max_body_size 50m;
-  client_body_buffer_size 128k;
-
-  location = / {
-    rewrite ^ '/SOGo'; 
-    allow all; 
-  }
-
-  location = /principals/ {
-    rewrite ^ '/SOGo/dav'; 
-    allow all; 
-  }
-
-  location ^~/SOGo {
-    proxy_pass 'http://127.0.0.1:20000'; 
-    proxy_redirect 'http://127.0.0.1:20000' default; 
-    # forward user's IP address 
-    proxy_set_header X-Real-IP $remote_addr; 
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 
-    proxy_set_header Host $host; 
-    proxy_set_header x-webobjects-server-protocol HTTP/1.0; 
-    proxy_set_header x-webobjects-remote-host 127.0.0.1; 
-    proxy_set_header x-webobjects-server-name $server_name; 
-    proxy_set_header x-webobjects-server-url $scheme://$host; 
-    proxy_set_header x-webobjects-server-port $server_port; 
-    proxy_connect_timeout 90;
-    proxy_send_timeout 90;
-    proxy_read_timeout 90;
-    proxy_buffer_size 4k;
-    proxy_buffers 4 32k;
-    proxy_busy_buffers_size 64k;
-    proxy_temp_file_write_size 64k;
-    break;
-  }
-
-  location /SOGo.woa/WebServerResources/ {
-    alias /usr/lib/GNUstep/SOGo/WebServerResources/;
-    allow all;
-    expires max;
-  }
-
-  location /SOGo/WebServerResources/ {
-    alias /usr/lib/GNUstep/SOGo/WebServerResources/; 
-    allow all;
-    expires max;
-  }
-
-  location (^/SOGo/so/ControlPanel/Products/([^/]*)/Resources/(.*)$) {
-    alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2;
-    expires max;
-  }
-
-  location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$) {
-    alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2;
-    expires max;
-  }
-
-  location ^~ /Microsoft-Server-ActiveSync {
-    access_log /var/log/nginx/activesync.log;
-    error_log  /var/log/nginx/activesync-error.log;
-      
-    proxy_connect_timeout 75;
-    proxy_send_timeout 3600;
-    proxy_read_timeout 3600;
-    proxy_buffers 64 256k;
-      
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      
-    proxy_pass http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync;
-    proxy_redirect http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync /;
-  }
-}