Skip to content
Snippets Groups Projects
Commit 8d047460 authored by nimrod's avatar nimrod
Browse files

Revert "A general master branch."

This reverts commit d4d48591 but not
completly, just the parts needed for the services moved to ns4.
parent a10f24ff
No related branches found
No related tags found
No related merge requests found
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
> Web proxy Dockerized setup. > 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 ## License
This software is licensed under the MIT license (see `LICENSE.txt`). This software is licensed under the MIT license (see `LICENSE.txt`).
......
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;
}
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;
}
}
...@@ -10,6 +10,7 @@ services: ...@@ -10,6 +10,7 @@ services:
default: default:
aliases: aliases:
- *hostname - *hostname
- autoconfig.shore.co.il
ports: ports:
- '80:80' - '80:80'
- '443:443' - '443:443'
......
<?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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment