Skip to content

Add www domain redirect support #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brainstemu wants to merge 1 commit into from
Closed

Add www domain redirect support #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 42 additions & 5 deletions community-edition/generate_script/hcce.yam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ spec:
image: $Container_Dockerhub_Username/reticulum:$Container_Tag
ports:
- containerPort: 9100
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
env:
- name: POD_IP
valueFrom:
Expand Down Expand Up @@ -561,6 +561,8 @@ spec:
value: "http://speelycaptor:5000"
- name: turkeyCfg_STORAGE_QUOTA_GB
value: "1000"
- name: ERL_MAX_PORTS
value: "1024"
livenessProbe:
httpGet:
path: /health
Expand Down Expand Up @@ -815,7 +817,7 @@ spec:
containers:
- name: hubs
image: $Container_Dockerhub_Username/hubs:$Container_Tag
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
env:
- name: turkeyCfg_thumbnail_server
value: 'cors.$HUB_DOMAIN/nearspark'
Expand Down Expand Up @@ -885,7 +887,7 @@ spec:
containers:
- name: spoke
image: $Container_Dockerhub_Username/spoke:$Container_Tag
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
env:
- name: turkeyCfg_thumbnail_server
value: 'cors.$HUB_DOMAIN/nearspark'
Expand Down Expand Up @@ -957,7 +959,7 @@ spec:
image: $Container_Dockerhub_Username/nearspark:$Container_Tag
ports:
- containerPort: 5000
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -1050,7 +1052,7 @@ spec:
containers:
- name: photomnemonic
image: $Container_Dockerhub_Username/photomnemonic:$Container_Tag
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -1240,6 +1242,8 @@ spec:
containers:
- name: haproxy
image: $Container_Dockerhub_Username/haproxy:$Container_Tag
command: ["sh", "-c", 'ulimit -n 524288 && /start.sh "$@"', "--"]

args:
- --configmap=$Namespace/haproxy-config
- --https-bind-port=4443
Expand Down Expand Up @@ -1381,3 +1385,36 @@ subjects:
- kind: ServiceAccount
name: haproxy-sa
namespace: $Namespace

---
##############################################################################################
############################################ www-redirect #######################################
##############################################################################################

apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: www-redirect
namespace: $Namespace
annotations:
kubernetes.io/ingress.class: haproxy
haproxy.org/config-snippet: |
http-request redirect prefix location https://$HUB_DOMAIN/ code 301
spec:
tls:
- hosts:
- www.$HUB_DOMAIN
secretName: cert-www.$HUB_DOMAIN
rules:
- host: www.$HUB_DOMAIN
http:
paths:
- path: /
pathType: Prefix
backend:
service:
# backend won't be used because of redirect annotation,
# but ingress requires one.
name: ret
port:
number: 4001
1 change: 1 addition & 0 deletions community-edition/ssl_script/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ function main() {
const template = utils.readTemplate("ssl_script", "cbb.yam");
const rootHubDomain = config.HUB_DOMAIN;
generate_ssl(config, template, rootHubDomain);
generate_ssl(config, template, `www.${rootHubDomain}`);
generate_ssl(config, template, `assets.${rootHubDomain}`);
generate_ssl(config, template, `stream.${rootHubDomain}`);
generate_ssl(config, template, `cors.${rootHubDomain}`);
Expand Down