Compare commits

..

No commits in common. "81e8eba70b48e89d4359718ae2b207cdf9ef9891" and "16e276df43951f9a700b5ac9636daf318c0a28d8" have entirely different histories.

5 changed files with 18 additions and 26 deletions

View File

@ -6,7 +6,6 @@ provider "registry.terraform.io/cloudflare/cloudflare" {
constraints = "~> 3.0" constraints = "~> 3.0"
hashes = [ hashes = [
"h1:oTTfUShNNcDCOxlXP2XiNleQYHmWswesQFCuicwQztw=", "h1:oTTfUShNNcDCOxlXP2XiNleQYHmWswesQFCuicwQztw=",
"h1:pb7gfJMtamHcmsNTAdB4V6iYWuXFLx3CErxqx2f+DXs=",
"zh:0dd08c3336b3198e30158b61605674eefbc0b8e331ad8f25322ce1889fd2d8a7", "zh:0dd08c3336b3198e30158b61605674eefbc0b8e331ad8f25322ce1889fd2d8a7",
"zh:196d80c7ae594f1b6140de02ecb101ec1afd7e45877be849ace73866f3fcb689", "zh:196d80c7ae594f1b6140de02ecb101ec1afd7e45877be849ace73866f3fcb689",
"zh:37bc087b5e858a92faf03c994cfbc4c906b0afecb7df2ff25961b394f3013cc0", "zh:37bc087b5e858a92faf03c994cfbc4c906b0afecb7df2ff25961b394f3013cc0",
@ -29,7 +28,6 @@ provider "registry.terraform.io/hashicorp/aws" {
constraints = "~> 3.0" constraints = "~> 3.0"
hashes = [ hashes = [
"h1:++H0a4igODgreQL3SJuRz71JZkC69rl41R8xLYM894o=", "h1:++H0a4igODgreQL3SJuRz71JZkC69rl41R8xLYM894o=",
"h1:OuaWibxL7IoGHmX6xuhO2XvYJcr+DJNr9pnVjaUiMrw=",
"zh:11c2ee541ca1da923356c9225575ba294523d7b6af82d6171c912470ef0f90cd", "zh:11c2ee541ca1da923356c9225575ba294523d7b6af82d6171c912470ef0f90cd",
"zh:19fe975993664252b4a2ff1079546f2b186b01d1a025a94a4f15c37e023806c5", "zh:19fe975993664252b4a2ff1079546f2b186b01d1a025a94a4f15c37e023806c5",
"zh:442e7fc145b2debebe9279b283d07f5f736dc1776c2e5b1702728a6eb03789d0", "zh:442e7fc145b2debebe9279b283d07f5f736dc1776c2e5b1702728a6eb03789d0",

View File

@ -1,6 +1,6 @@
resource "cloudflare_access_group" "family" { resource "cloudflare_access_group" "family" {
account_id = var.CLOUDFLARE_ACCOUNT_ID account_id = var.CLOUDFLARE_ACCOUNT_ID
name = "family group" name = "family group"
include { include {
email_domain = ["@ahosking.com"] email_domain = ["@ahosking.com"]
@ -13,7 +13,7 @@ resource "cloudflare_access_application" "influx" {
domain = "influx.ahoskingit.com" domain = "influx.ahoskingit.com"
type = "self_hosted" type = "self_hosted"
session_duration = "168h" session_duration = "168h"
logo_url = "https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fupload.wikimedia.org%2Fwikipedia%2Fcommons%2Fthumb%2Fc%2Fc6%2FInfluxdb_logo.svg%2F1920px-Influxdb_logo.svg" logo_url = "https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fupload.wikimedia.org%2Fwikipedia%2Fcommons%2Fthumb%2Fc%2Fc6%2FInfluxdb_logo.svg%2F1920px-Influxdb_logo.svg"
allowed_idps = [ allowed_idps = [
"f27ba272-b676-4ab0-b560-e4ea52b19f18", #TODO: Remove Manual Entry "f27ba272-b676-4ab0-b560-e4ea52b19f18", #TODO: Remove Manual Entry
"ba68cb89-c20b-49ab-8aea-26b3af318196", #TODO: Remove Manual Entry "ba68cb89-c20b-49ab-8aea-26b3af318196", #TODO: Remove Manual Entry
@ -29,16 +29,14 @@ resource "cloudflare_access_application" "money" {
allowed_idps = [ allowed_idps = [
"f27ba272-b676-4ab0-b560-e4ea52b19f18", #TODO: Remove Manual Entry "f27ba272-b676-4ab0-b560-e4ea52b19f18", #TODO: Remove Manual Entry
] ]
http_only_cookie_attribute = true
} }
resource "cloudflare_access_policy" "money" { resource "cloudflare_access_policy" "money" {
application_id = cloudflare_access_application.money.id application_id = cloudflare_access_application.money.id
zone_id = cloudflare_zone.ahosking_com.id zone_id = cloudflare_zone.ahosking_com.id
name = "family" name = "family"
precedence = "2" precedence = "1"
decision = "allow" decision = "allow"
include { include {
email_domain = ["@ahosking.com"] email_domain = ["@ahosking.com"]
} }
@ -69,25 +67,23 @@ resource "cloudflare_access_application" "tv" {
] ]
} }
resource "cloudflare_access_application" "cycles" { resource "cloudflare_access_application" "period" {
account_id = var.CLOUDFLARE_ACCOUNT_ID account_id = var.CLOUDFLARE_ACCOUNT_ID
name = "cycles" name = "period"
domain = "cycles.ahosking.com" domain = "period.ahosking.com"
type = "self_hosted" type = "self_hosted"
session_duration = "336h" session_duration = "336h"
allowed_idps = [ allowed_idps = [
"f27ba272-b676-4ab0-b560-e4ea52b19f18", #TODO: Remove Manual Entry "f27ba272-b676-4ab0-b560-e4ea52b19f18", #TODO: Remove Manual Entry
] ]
http_only_cookie_attribute = true
} }
resource "cloudflare_access_policy" "cycles" { resource "cloudflare_access_policy" "period" {
application_id = cloudflare_access_application.cycles.id application_id = cloudflare_access_application.period.id
zone_id = cloudflare_zone.ahosking_com.id zone_id = cloudflare_zone.ahosking_com.id
name = "family" name = "family"
precedence = "1" precedence = "1"
decision = "allow" decision = "allow"
include { include {
email_domain = ["@ahosking.com"] email_domain = ["@ahosking.com"]
} }

View File

@ -1 +1 @@
home_ip = "184.147.40.112" home_ip = "174.91.157.243"

View File

@ -37,6 +37,5 @@ variable "environment" {}
variable "ahosking_com_cnames" { variable "ahosking_com_cnames" {
default = ["code", "radarr", "sonarr", "ombi", "git", default = ["code", "radarr", "sonarr", "ombi", "git",
"monitors", "tv", "movies", "money", "cycles", "plex", "monitors", "tv", "movies", "money", "cycles", "plex"]
"minecraft", "homeassistant", "slack", "status", "bills"]
} }

View File

@ -22,8 +22,7 @@
"activityBar.activeBackground": "#ef7853", "activityBar.activeBackground": "#ef7853",
"sash.hoverBorder": "#ef7853", "sash.hoverBorder": "#ef7853",
"statusBarItem.remoteBackground": "#eb5424", "statusBarItem.remoteBackground": "#eb5424",
"statusBarItem.remoteForeground": "#e7e7e7", "statusBarItem.remoteForeground": "#e7e7e7"
"commandCenter.border": "#e7e7e799"
}, },
"peacock.color": "#eb5424" "peacock.color": "#eb5424"
} }