adding next and also modifying the nginx file
This commit is contained in:
@@ -43,3 +43,48 @@ server {
|
|||||||
return 404;
|
return 404;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
############################################
|
||||||
|
# config file for ${name_site}
|
||||||
|
############################################
|
||||||
|
|
||||||
|
upstream ${name_site}_backend_root {
|
||||||
|
server ${name_service};
|
||||||
|
server 1.1.1.1 backup;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
server_name ${name_site}.geeraert.eu www.${name_site}.geeraert.eu;
|
||||||
|
location / {
|
||||||
|
proxy_pass http://${name_site}_backend_root;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
}
|
||||||
|
location /.well-known/acme-challenge/ {
|
||||||
|
root /var/www/certbot;
|
||||||
|
}
|
||||||
|
|
||||||
|
access_log /var/log/nginx/access.log my_custom_format;
|
||||||
|
access_log /var/log/nginx/ip_audit.log ip_audit;
|
||||||
|
|
||||||
|
listen 443 ssl;
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/ssl/live/geeraert.eu/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/ssl/live/geeraert.eu/privkey.pem;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
if ($host = www.${name_site}.geeraert.eu) {
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if ($host = ${name_site}.geeraert.eu) {
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server_name www.${name_site}.geeraert.eu ${name_site}.geeraert.eu;
|
||||||
|
listen 80;
|
||||||
|
return 404;
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
+2752
-1443
File diff suppressed because it is too large
Load Diff
+2753
-1444
File diff suppressed because it is too large
Load Diff
+16
-47
@@ -671,72 +671,40 @@ kubernetes = {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
next = {
|
nextcloud = {
|
||||||
enabled = false
|
#enabled = false
|
||||||
namespace = "next"
|
namespace = "next"
|
||||||
replicas = 01
|
replicas = 1
|
||||||
image = "nextcloud:29.0.3-apache"
|
image = "nextcloud:29.0.3-apache"
|
||||||
|
domain_name = "next"
|
||||||
service_port = [80]
|
service_port = [80]
|
||||||
extra_manifest = ["/opt/kubernetes/Nextcloud_kube/next.secret.yaml"]
|
#extra_manifest = ["/opt/kubernetes/Nextcloud_kube/next.secret.yaml"]
|
||||||
|
secret_ref = ["nextcloud-credentials"]
|
||||||
|
secret_import = ["b207c4b6-0489-4ab2-a032-b4a400a708e0"]
|
||||||
database = {
|
database = {
|
||||||
image = "docker.io/library/postgres:14" }
|
image = "docker.io/library/postgres:14" }
|
||||||
redis = {
|
redis = {
|
||||||
image = "docker.io/library/redis:7" }
|
image = "docker.io/library/redis:7" }
|
||||||
requirements = {
|
#requirements = {
|
||||||
limits-cpu = "800Mi"
|
# limits-cpu = "800Mi"
|
||||||
limits-memory = "800Mi"
|
# limits-memory = "800Mi"
|
||||||
requests-cpu = "800Mi"
|
# requests-cpu = "800Mi"
|
||||||
requests-memory = "800Mi"
|
# requests-memory = "800Mi"
|
||||||
}
|
#}
|
||||||
environment = {
|
environment = {
|
||||||
POSTGRES_DB = {
|
|
||||||
value_from = {
|
|
||||||
secret_key_ref = {
|
|
||||||
name = "nextcloud-credentials"
|
|
||||||
key = "POSTGRES_DB"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
POSTGRES_USER = {
|
|
||||||
value_from = {
|
|
||||||
secret_key_ref = {
|
|
||||||
name = "nextcloud-credentials"
|
|
||||||
key = "POSTGRES_USER"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
POSTGRES_PASSWORD = {
|
|
||||||
value_from = {
|
|
||||||
secret_key_ref = {
|
|
||||||
name = "nextcloud-credentials"
|
|
||||||
key = "POSTGRES_PASSWORD"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
POSTGRES_HOST = {
|
|
||||||
value_from = {
|
|
||||||
secret_key_ref = {
|
|
||||||
name = "nextcloud-credentials"
|
|
||||||
key = "POSTGRES_HOST"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# REDIS_HOST = {
|
|
||||||
# value = "redis://next-redis-svc:6379"
|
|
||||||
# }
|
|
||||||
TRUSTED_PROXIES = {
|
TRUSTED_PROXIES = {
|
||||||
value = "192.168.88.50 192.168.88.52"
|
value = "192.168.88.50 192.168.88.52"
|
||||||
}
|
}
|
||||||
OVERWRITECLIURL = {
|
OVERWRITECLIURL = {
|
||||||
value = "https://nextcloud.geeraert.eu"
|
value = "https://next.geeraert.eu"
|
||||||
}
|
}
|
||||||
OVERWRITEPROTOCOL = {
|
OVERWRITEPROTOCOL = {
|
||||||
value = "https"
|
value = "https"
|
||||||
}
|
}
|
||||||
|
|
||||||
NEXTCLOUD_TRUSTED_DOMAINS = {
|
NEXTCLOUD_TRUSTED_DOMAINS = {
|
||||||
value = "nextcloud.geeraert.eu nextcloud.tryton.geeraert.eu 192.168.88.52"
|
value = "next.geeraert.eu next.tryton.geeraert.eu 192.168.88.52"
|
||||||
}
|
}
|
||||||
NEXTCLOUD_ADMIN_USER = {
|
NEXTCLOUD_ADMIN_USER = {
|
||||||
value = "admin"
|
value = "admin"
|
||||||
@@ -749,6 +717,7 @@ kubernetes = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
pvc = {
|
pvc = {
|
||||||
nextcloud-webserver = {
|
nextcloud-webserver = {
|
||||||
|
|||||||
Reference in New Issue
Block a user