Skip to content

Commit

Permalink
1880 ➡️ 1912
Browse files Browse the repository at this point in the history
  • Loading branch information
esinx committed Aug 23, 2024
1 parent d4eeec0 commit 48ce632
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions terraform/cert-manager-files/cert.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: ${NAME}-cis1880-org
name: ${NAME}-cis1912-org
spec:
secretName: ${NAME}-cis1880-org-tls
secretName: ${NAME}-cis1912-org-tls
dnsNames:
- "${NAME}.cis1880.org"
- "${NAME}.cis1912.org"
issuerRef:
name: letsencrypt-prod
kind: ClusterIssuer
Expand Down
10 changes: 5 additions & 5 deletions terraform/helm/grafana.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ingress:
enabled: true
hosts:
- grafana.cis1880.org
- grafana.cis1912.org
tls:
- secretName: grafana-cis1880-org-tls
- secretName: grafana-cis1912-org-tls
hosts:
- grafana.cis1880.org
- grafana.cis1912.org

admin:
existingSecret: grafana
Expand Down Expand Up @@ -57,7 +57,7 @@ datasources:

grafana.ini:
server:
domain: "grafana.cis1880.org"
domain: "grafana.cis1912.org"
root_url: "https://%(domain)s/"
auth.github:
enabled: true
Expand All @@ -66,6 +66,6 @@ grafana.ini:
token_url: https://github.com/login/oauth/access_token
api_url: https://api.github.com/user
allow_sign_up: true
allowed_organizations: cis1880
allowed_organizations: cis1912

envFromSecret: "grafana"
2 changes: 1 addition & 1 deletion terraform/modules/hw_repo/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resource "github_repository" "hw" {
visibility = "private"

template {
owner = "cis1880"
owner = "cis1912"
repository = var.hw
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ provider "kubernetes" {
}

provider "github" {
organization = "cis1880"
organization = "cis1912"
}

terraform {
Expand Down
4 changes: 2 additions & 2 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ variable "image_pull_pat" {

variable "GF_GH_CLIENT_ID" {
type = string
description = "GitHub Client ID for the CIS1880 Grafana OAuth2 Application"
description = "GitHub Client ID for the CIS1912 Grafana OAuth2 Application"
}

variable "GF_GH_CLIENT_SECRET" {
type = string
description = "GitHub Client Secret for the CIS1880 Grafana OAuth2 Application"
description = "GitHub Client Secret for the CIS1912 Grafana OAuth2 Application"
}

variable "emails" {
Expand Down

0 comments on commit 48ce632

Please sign in to comment.