From 22fd55f8f618ece29e8963bfa7fc0b10f3946f30 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 12 Jan 2021 15:28:57 +0200
Subject: [PATCH] Revert "A general master branch."
This reverts commit d4d485914fd18911fbe179570c78980ce59f5c50 but not
completly, just the parts needed for the services moved to ns4.
---
README.md | 5 ----
conf.d/autoconfig.shore.co.il.conf | 21 ++++++++++++++++
conf.d/registry.shore.co.il.conf | 23 ++++++++++++++++++
docker-compose.yml | 1 +
.../mail/config-v1.1.xml | 24 +++++++++++++++++++
5 files changed, 69 insertions(+), 5 deletions(-)
create mode 100644 conf.d/autoconfig.shore.co.il.conf
create mode 100644 conf.d/registry.shore.co.il.conf
create mode 100644 www/autoconfig.shore.co.il/mail/config-v1.1.xml
diff --git a/README.md b/README.md
index ec8bb8e..cefa360 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,6 @@
> Web proxy Dockerized setup.
-## Branches
-
-The `master` branch doesn't have any configuration in it. The `ns4` and `host01`
-branches have configuration for those hoss.
-
## License
This software is licensed under the MIT license (see `LICENSE.txt`).
diff --git a/conf.d/autoconfig.shore.co.il.conf b/conf.d/autoconfig.shore.co.il.conf
new file mode 100644
index 0000000..84109f9
--- /dev/null
+++ b/conf.d/autoconfig.shore.co.il.conf
@@ -0,0 +1,21 @@
+server {
+ listen 80;
+ listen [::]:80;
+ server_name autoconfig.shore.co.il;
+ root /var/www/autoconfig.shore.co.il/;
+ include snippets/www-acme-challenge.conf;
+ include snippets/ads-txt.conf;
+ include snippets/security-txt.conf;
+ include snippets/robots-allow-all.conf;
+}
+
+server {
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ server_name autoconfig.shore.co.il;
+ root /var/www/autoconfig.shore.co.il/;
+ include snippets/robots-allow-all.conf;
+ include snippets/ads-txt.conf;
+ include snippets/security-txt.conf;
+ include snippets/ssl.conf;
+}
diff --git a/conf.d/registry.shore.co.il.conf b/conf.d/registry.shore.co.il.conf
new file mode 100644
index 0000000..07a2902
--- /dev/null
+++ b/conf.d/registry.shore.co.il.conf
@@ -0,0 +1,23 @@
+map $host $registry { default registy; }
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name registry.shore.co.il;
+ include snippets/www-acme-challenge.conf;
+ include snippets/redirect-https.conf;
+}
+
+server {
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ server_name registry.shore.co.il;
+ include snippets/ssl.conf;
+
+ location / {
+ proxy_pass http://$registry$request_uri;
+ proxy_http_version 1.1;
+ include snippets/proxy-headers.conf;
+ include snippets/allow-private-ips.conf;
+ }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 23b11dd..bf2e183 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
default:
aliases:
- *hostname
+ - autoconfig.shore.co.il
ports:
- '80:80'
- '443:443'
diff --git a/www/autoconfig.shore.co.il/mail/config-v1.1.xml b/www/autoconfig.shore.co.il/mail/config-v1.1.xml
new file mode 100644
index 0000000..47a4197
--- /dev/null
+++ b/www/autoconfig.shore.co.il/mail/config-v1.1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig version="1.1">
+ <emailProvider id="shore.co.il">
+ <domain>shore.co.il</domain>
+ <displayName>Shore technologies</displayName>
+ <displayShortName>Shore</displayShortName>
+ <incomingServer type="imap">
+ <hostname>imap.shore.co.il</hostname>
+ <port>993</port>
+ <socketType>SSL</socketType>
+ <authentication>password-cleartext</authentication>
+ <username>%EMAILLOCALPART%</username>
+ </incomingServer>
+ <outgoingServer type="smtp">
+ <hostname>smtp.shore.co.il</hostname>
+ <port>587</port>
+ <socketType>STARTTLS</socketType>
+ <authentication>password-cleartext</authentication>
+ <username>%EMAILLOCALPART%</username>
+ </outgoingServer>
+ </emailProvider>
+</clientConfig>
+
--
GitLab