Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ea1500546 |
+2
-2
@@ -16,8 +16,8 @@
|
|||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixpkgs-unstable",
|
"name": "nixpkgs-unstable",
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre930822.ed142ab1b3a0/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre937085.6308c3b21396/nixexprs.tar.xz",
|
||||||
"hash": "sha256-XH6awru9NnBc/m+2YhRNT8r1PAKEiPGF3gs//F3ods0="
|
"hash": "sha256-RuGWBqXVEsZwwBvRGS/nRrA6PQyOQwVaAu139Z853Bk="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"version": 7
|
"version": 7
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ spec:
|
|||||||
sourceRepos:
|
sourceRepos:
|
||||||
- https://argoproj.github.io/argo-helm
|
- https://argoproj.github.io/argo-helm
|
||||||
- https://kubernetes-sigs.github.io/metrics-server/
|
- https://kubernetes-sigs.github.io/metrics-server/
|
||||||
- https://git.oceanbox.io/oceanbox/manifests
|
|
||||||
- https://gitlab.com/oceanbox/manifests.git
|
- https://gitlab.com/oceanbox/manifests.git
|
||||||
- https://kubernetes.github.io/ingress-nginx
|
- https://kubernetes.github.io/ingress-nginx
|
||||||
- https://cloudnative-pg.github.io/charts
|
- https://cloudnative-pg.github.io/charts
|
||||||
|
|||||||
@@ -4,15 +4,15 @@ metadata:
|
|||||||
name: attic
|
name: attic
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
finalizers:
|
finalizers:
|
||||||
- resources-finalizer.argocd.argoproj.io
|
- resources-finalizer.argocd.argoproj.io
|
||||||
spec:
|
spec:
|
||||||
destination:
|
destination:
|
||||||
namespace: attic
|
namespace: attic
|
||||||
server: "https://kubernetes.default.svc"
|
server: 'https://kubernetes.default.svc'
|
||||||
sources:
|
sources:
|
||||||
- repoURL: https://git.oceanbox.io/oceanbox/manifests.git
|
- repoURL: https://gitlab.com/oceanbox/manifests.git
|
||||||
targetRevision: HEAD
|
targetRevision: HEAD
|
||||||
path: values/attic/manifests
|
path: values/attic/manifests
|
||||||
project: aux
|
project: aux
|
||||||
syncPolicy:
|
syncPolicy:
|
||||||
managedNamespaceMetadata:
|
managedNamespaceMetadata:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
clusterConfig:
|
clusterConfig:
|
||||||
manifests: https://git.oceanbox.io/oceanbox/manifests.git
|
manifests: https://gitlab.com/oceanbox/manifests.git
|
||||||
cilium:
|
cilium:
|
||||||
enabled: false
|
enabled: false
|
||||||
env: "prod"
|
env: "prod"
|
||||||
|
|||||||
@@ -71,14 +71,16 @@ gitea:
|
|||||||
oauth2_client:
|
oauth2_client:
|
||||||
REGISTER_EMAIL_CONFIRM: false
|
REGISTER_EMAIL_CONFIRM: false
|
||||||
ENABLE_AUTO_REGISTRATION: true
|
ENABLE_AUTO_REGISTRATION: true
|
||||||
ACCOUNT_LINKING: "login"
|
UPDATE_AVATAR: true
|
||||||
USERNAME: "nickname"
|
ACCOUNT_LINKING: auto
|
||||||
mailer:
|
# mailer:
|
||||||
ENABLED: true
|
# ENABLED: true
|
||||||
FROM: "gitea@oceanbox.io"
|
# FROM: "noreply@oceanbox.io"
|
||||||
PROTOCOL: "smtp"
|
# PROTOCOL: "smtp+startls"
|
||||||
SMTP_ADDR: "postfix-mail.postfix.svc.cluster.local"
|
# SMTP_ADDR: "smtp.office365.com"
|
||||||
SMTP_PORT: 587
|
# SMTP_PORT: 587
|
||||||
|
# USER: "noreply@oceanbox.io"
|
||||||
|
# PASSWD:
|
||||||
database:
|
database:
|
||||||
DB_TYPE: postgres
|
DB_TYPE: postgres
|
||||||
MAX_OPEN_CONNS: 90
|
MAX_OPEN_CONNS: 90
|
||||||
@@ -91,6 +93,9 @@ gitea:
|
|||||||
existingSecret: gitea-oauth-oceanbox
|
existingSecret: gitea-oauth-oceanbox
|
||||||
autoDiscoverUrl: "https://login.microsoftonline.com/3f737008-e9a0-4485-9d27-40329d288089/.well-known/openid-configuration"
|
autoDiscoverUrl: "https://login.microsoftonline.com/3f737008-e9a0-4485-9d27-40329d288089/.well-known/openid-configuration"
|
||||||
scopes: "openid profile email groups"
|
scopes: "openid profile email groups"
|
||||||
|
groupClaimName: "groups"
|
||||||
|
adminGroup: "/oceanbox/devel"
|
||||||
|
restrictedGroup: ""
|
||||||
additionalConfigFromEnvs:
|
additionalConfigFromEnvs:
|
||||||
- name: GITEA__STORAGE__MINIO_ACCESS_KEY_ID
|
- name: GITEA__STORAGE__MINIO_ACCESS_KEY_ID
|
||||||
valueFrom:
|
valueFrom:
|
||||||
@@ -143,7 +148,7 @@ ingress:
|
|||||||
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
||||||
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
|
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
|
||||||
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
|
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
|
||||||
nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,172.19.255.0/24,100.64.0.0/12,185.125.160.4/32,37.27.203.38/32
|
nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,172.19.255.0/24,100.64.0.0/12
|
||||||
hosts:
|
hosts:
|
||||||
- host: git.oceanbox.io
|
- host: git.oceanbox.io
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
@@ -115,8 +115,6 @@ configMaps:
|
|||||||
"isa.rosso@oceanbox.io",
|
"isa.rosso@oceanbox.io",
|
||||||
"jonathan.lilly@oceanbox.io",
|
"jonathan.lilly@oceanbox.io",
|
||||||
"faith.iha@oceanbox.io",
|
"faith.iha@oceanbox.io",
|
||||||
"elianne.ersdal@oceanbox.io", │
|
|
||||||
"hanskristian.djuve@oceanbox.io",
|
|
||||||
],
|
],
|
||||||
"group:manager": [
|
"group:manager": [
|
||||||
"svenn.hanssen@oceanbox.io",
|
"svenn.hanssen@oceanbox.io",
|
||||||
@@ -215,10 +213,9 @@ configMaps:
|
|||||||
],
|
],
|
||||||
"dst": [
|
"dst": [
|
||||||
"tag:mumindalen:*",
|
"tag:mumindalen:*",
|
||||||
"tag:hel1:*",
|
|
||||||
"tag:hpc:22,80,443",
|
"tag:hpc:22,80,443",
|
||||||
"dc.tos.net:22,80,443",
|
"dc.tos.net:22,80,443",
|
||||||
"dc.hel1.net:22,443",
|
"dc.hel1.net:443",
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -27,17 +27,16 @@ config:
|
|||||||
LOG_FORMAT: "json"
|
LOG_FORMAT: "json"
|
||||||
ALLOW_EMPTY_SENDER_DOMAINS: "true"
|
ALLOW_EMPTY_SENDER_DOMAINS: "true"
|
||||||
ALLOWED_SENDER_DOMAINS: "oceanbox.io"
|
ALLOWED_SENDER_DOMAINS: "oceanbox.io"
|
||||||
RELAYHOST: "[smtp.office365.com]:587"
|
RELAYHOST: "smtp.office365.com:587"
|
||||||
RELAYHOST_USERNAME: "gitea@oceanbox.io"
|
RELAYHOST_USERNAME: "noreply@oceanbox.io"
|
||||||
XOAUTH2_CLIENT_ID: "00c73c4a-1ad5-477d-b773-d5d63986061e"
|
RELAYHOST_PASSWORD: "00c73c4a-1ad5-477d-b773-d5d63986061e"
|
||||||
XOAUTH2_SECRET: "3E18Q~ONNftFcCmHIHZmPbLtVqwLDBSCwI9hGagV"
|
|
||||||
XOAUTH2_TOKEN_ENDPOINT: https://login.microsoftonline.com/3f737008-e9a0-4485-9d27-40329d288089/oauth2/v2.0/token
|
|
||||||
# XOAUTH2_INITIAL_ACCESS_TOKEN: ""
|
|
||||||
# XOAUTH2_INITIAL_REFRESH_TOKEN: ""
|
|
||||||
XOAUTH2_SYSLOG_ON_FAILURE: "no"
|
|
||||||
XOAUTH2_FULL_TRACE: "no"
|
|
||||||
postfix:
|
postfix:
|
||||||
smtp_tls_security_level: "encrypt"
|
myhostname: "oceanbox.io"
|
||||||
|
# mynetworks: "127.0.0.0/8, 10.1.0.0/24"
|
||||||
|
smtp_tls_security_level: "may"
|
||||||
|
# To reduce log noise, only try authentication mechanisms supported by Zoho.com
|
||||||
|
smtpd_sasl_auth_enable: "no"
|
||||||
|
smtp_sasl_mechanism_filter: "plain, login"
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
|||||||
Reference in New Issue
Block a user