From d2851d071577b5e53612a458c3c6d3ca50787629 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 28 Nov 2017 01:04:25 -0500 Subject: [PATCH] Latest DNS and beginning of GCloud --- ahoskingit/terraform/dns_ahoskingit.tf | 7 + ahoskingit/terraform/prodviders.tf | 8 +- ahoskingit/terraform/terraform.tfstate | 32 ++++- ahoskingit/terraform/terraform.tfstate.backup | 12 +- ahoskingit/terraform/terraform.vault | 133 ++++++++++++++++-- ahoskingit/terraform/variables.tf | 11 ++ 6 files changed, 184 insertions(+), 19 deletions(-) diff --git a/ahoskingit/terraform/dns_ahoskingit.tf b/ahoskingit/terraform/dns_ahoskingit.tf index 588f2a0..e8d691f 100644 --- a/ahoskingit/terraform/dns_ahoskingit.tf +++ b/ahoskingit/terraform/dns_ahoskingit.tf @@ -61,6 +61,13 @@ resource "aws_route53_record" "inventory_ahoskingit" { records = ["${aws_route53_record.home_ahoskingit.name}"] } +resource "aws_route53_record" "requests_plex_ahoskingit" { + zone_id = "${aws_route53_zone.ahoskingit.zone_id}" + name = "requests.plex.ahoskingit.com" + type = "CNAME" + ttl = "5" + records = ["${aws_route53_record.home_ahoskingit.name}"] +} resource "aws_route53_record" "plex_ahoskingit" { zone_id = "${aws_route53_zone.ahoskingit.zone_id}" name = "plex.ahoskingit.com" diff --git a/ahoskingit/terraform/prodviders.tf b/ahoskingit/terraform/prodviders.tf index 4c58591..3b7bdd5 100644 --- a/ahoskingit/terraform/prodviders.tf +++ b/ahoskingit/terraform/prodviders.tf @@ -1,7 +1,11 @@ provider "aws" { - access_key = "${var.aws_access_key}" secret_key = "${var.aws_secret_key}" region = "${var.aws_region}" - +} + +provider "google" { + credentials = "" +# project = "${var.gcp_project}" + region = "${var.gcp_region}" } diff --git a/ahoskingit/terraform/terraform.tfstate b/ahoskingit/terraform/terraform.tfstate index ed8f5fd..89ced9f 100644 --- a/ahoskingit/terraform/terraform.tfstate +++ b/ahoskingit/terraform/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 3, - "terraform_version": "0.10.5", - "serial": 21, + "terraform_version": "0.10.7", + "serial": 22, "lineage": "db7d87ff-3078-47ed-a0a9-91749a2dbba5", "modules": [ { @@ -990,6 +990,34 @@ "deposed": [], "provider": "" }, + "aws_route53_record.requests_plex_ahoskingit": { + "type": "aws_route53_record", + "depends_on": [ + "aws_route53_record.home_ahoskingit", + "aws_route53_zone.ahoskingit" + ], + "primary": { + "id": "Z2HTSYFXB5HXD9_requests.plex.ahoskingit.com_CNAME", + "attributes": { + "fqdn": "requests.plex.ahoskingit.com", + "health_check_id": "", + "id": "Z2HTSYFXB5HXD9_requests.plex.ahoskingit.com_CNAME", + "name": "requests.plex.ahoskingit.com", + "records.#": "1", + "records.1011144593": "home.ahoskingit.com", + "set_identifier": "", + "ttl": "5", + "type": "CNAME", + "zone_id": "Z2HTSYFXB5HXD9" + }, + "meta": { + "schema_version": "2" + }, + "tainted": false + }, + "deposed": [], + "provider": "" + }, "aws_route53_record.support_ahoskingit": { "type": "aws_route53_record", "depends_on": [ diff --git a/ahoskingit/terraform/terraform.tfstate.backup b/ahoskingit/terraform/terraform.tfstate.backup index 998ebb8..f4086e7 100755 --- a/ahoskingit/terraform/terraform.tfstate.backup +++ b/ahoskingit/terraform/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 3, - "terraform_version": "0.9.8", - "serial": 21, + "terraform_version": "0.10.5", + "serial": 22, "lineage": "db7d87ff-3078-47ed-a0a9-91749a2dbba5", "modules": [ { @@ -389,7 +389,7 @@ "id": "Z2HTSYFXB5HXD9_baby.ahoskingit.com_A", "name": "baby.ahoskingit.com", "records.#": "1", - "records.2764920476": "174.114.190.249", + "records.3606820868": "173.34.159.142", "set_identifier": "", "ttl": "5", "type": "A", @@ -640,7 +640,7 @@ "id": "Z2HTSYFXB5HXD9_home.ahoskingit.com_A", "name": "home.ahoskingit.com", "records.#": "1", - "records.2764920476": "174.114.190.249", + "records.3606820868": "173.34.159.142", "set_identifier": "", "ttl": "5", "type": "A", @@ -667,7 +667,7 @@ "id": "Z1K67K6B7LVE6O_home.ahoskingit.ca_A", "name": "home.ahoskingit.ca", "records.#": "1", - "records.2764920476": "174.114.190.249", + "records.3606820868": "173.34.159.142", "set_identifier": "", "ttl": "5", "type": "A", @@ -1059,7 +1059,7 @@ "id": "Z1H1ULBVLBNLL2_support.automatedbytes.com_A", "name": "support.automatedbytes.com", "records.#": "1", - "records.2764920476": "174.114.190.249", + "records.3606820868": "173.34.159.142", "set_identifier": "", "ttl": "5", "type": "A", diff --git a/ahoskingit/terraform/terraform.vault b/ahoskingit/terraform/terraform.vault index 4835219..17e894e 100644 --- a/ahoskingit/terraform/terraform.vault +++ b/ahoskingit/terraform/terraform.vault @@ -1,10 +1,125 @@ $ANSIBLE_VAULT;1.1;AES256 -62386630666534333733353038396465343361613734333565373865316533326138366535633162 -6265653138393566343833323933643431626134356237660a333730383834343539393861653061 -66313437383035373864363132336331353233356436646237353261656231376637643339396131 -6633613834333435330a303630363162326265363038336636663236373865613530613163393164 -62346338316330626565656433383262646436613935656434393062323164393938343437663535 -30626135663563343461626463646266333035386532613263613832633366343431623566613765 -35313365653763663336346362346365393237386433616539303662326532363436633036323966 -30393032393333396162303965343961316561643537383437306337323839333461343834353936 -6463 +65343734353439396335323763663364373435323561363663663265313630656265646435333036 +3531613065356664356466663738303263373439663638610a336631633366386365346334653466 +31383766623937366136306565666534306335393338363930353532306261386134616533383835 +6439623233343763300a393539626234663962653164376139313435393332336635303566643530 +36356464353737333531656362306434666334383037343635363638353862316230633666663138 +31336330303431623265336561386562613864663834323234356235656564366534616562386337 +33336138363332626635626566626437346265393536373463393435313366353734396163623265 +31666130633631663266396363626339396530313831336663666536653736656432623538626438 +37613266383133633432343863306165643939333463616461363733326130373933333461376164 +33346130323464363363613865663035306534643263633437383063386361303161616234333337 +36343961633162393530343830393139393836306336373039313135663539643839326339656139 +36363139343264393663373463336665666234353563363038396666353666313737363530396631 +39613937376433383537653937393134366536396432666261616437656661396163636164643334 +33363966623434376266646338656232363330356235353462356430616230353831383562643461 +61393531663332366136613464323765356564616463316464313836383861313961336461663861 +39653734656339393163346564633733386437346265616536363462313363653837366262666564 +37616132663739323065306138643232383061313330343831363336313166356332326464663937 +30653234366131623030333561336530326261616233326563636233666237653030626434643263 +37626537336639336663306330393231616366393233323533626332373233646261623532363338 +62653666396463616536333334643631636461366363616333346631373464353130663732313332 +64363038656634646439623266643533643732343461363033363539346631636164353261323733 +33616538653635306438646539666635366632623666336632393262396630393730636162643630 +31613962646434363264316364393464366532323236306662656165313330313839316534666238 +64613137343463313263386434653732333463326461623034303431333263383037313133303862 +65373134366436323735306333316335656233646363303261386463666330346465393935303735 +66663361383339333936343133623264623863333066613432303361393939346138326263616463 +61386337393130393639663533323134336237313630653066336339323562613434636438303766 +31393438386563643339643463356464333464633738653537653932653264653634306464303065 +62316133636430323661656230303437376430636262646437356264376665383061386264626237 +37393364623266633331616562343330333035336137313530663139323834656331363161326264 +35316263376136376136626234346466396432336137303435363432663063343065653337366164 +64666165396230396338303838646437303661363661643333363361633766313333613563633034 +39656562393465626365623534316561373264366434623537653433356235653136333434336333 +37333961333034346539653737353937346465663937323966323633373566306630626432643365 +32646337366238616133666538663938666164333033343834373034656464626162626234323465 +34303438653362373866356138636134613933306632346361343833393735343632636433636236 +37343366363864306263643166336439313136636437633361633861333238333665633162333835 +61336435353338633835636638333235643534383263373634326532303932663836393238376663 +30373833326362353961343834383730326331633866636232626162303161623932313430316130 +32663731383066306232343738363533326138303761613936353361393862336662336134646331 +61333566663362623365643837346333356564353734346565396337396434666263363062343031 +33386537613163316430363238326339386239363434393635326134666539323165373836333966 +32623632316631666135636538353837396232336339303764653566616465653363663430383335 +35343839383439373633663233363835303536393533633032363565363266633161613436373138 +36356637636531366564653733353536396661653339386530653031633635613837633866653161 +33343465356465316562613336323036366165633761313163373732326238616135313264313262 +64363866363838353261353834623039336139333136363035653737366238383834363132343736 +37333166313162613965363337396466383433303963376162386663373061616164663539366162 +32663037376436653639636365613765396364353330613662323566303737663562323732333264 +37353163656137636137373931373661353039323138323639333632393661663938653837373362 +63653633346639306632366139373765646535656632333432363634663632393638636166656434 +34373033343366643231346430663364356230353761383562306333663565363437313265633338 +32323863646465643133376362396664353465353330626161343735656335303439376163313133 +63373938383263643435363132663832383034366364393762623163313637623733326138656663 +33663837643039663537313162366162366166333238663637626362353764363538373338643936 +34303538393163653137373964613831663261363862393332613933656466383236303364653432 +64366232663363363462653630343364666231646432626562326630353064636466313361346631 +39656237333536626538373631333436356263343564306434633233383764376334653765353262 +32356334393864393766366461316439303761636630643832326361623162633065613432356661 +34626230343234346265353661613832346230343631666233393837396437353830356334363935 +33366166336536623234396539656630326461316266373861616230666338313039633536346663 +36643236633834613732636362636264356365663563353830333834386234306562313061643037 +62363139313832643934316433303635643739393838343531323931346263316439343134646432 +31613764353464323335366366313131326633306566383266363033343463336537386337653636 +35653532393538353461613732663135303065346537363163313865373662396637646435336430 +62383864653339663933636461373736336664633733323836643536393834396663343634623138 +39333837623431383634343433633135646331626634363237636265613239376535353531316332 +31343830346134663530306138353037366564303062333835353162613731366432623666633339 +63393962613463303461373530646461396435356137393666373363333165646139653631326135 +34326563316535376165376239623738346264343736333737623633633665306231663837366136 +62613336643238653966313936376236643265626362383465656230353737306133353638343733 +37343734393063366365316363656239383330653064623936313632346335653866366633393263 +66323533613633336630373361306461306430626332326264643937633031373164613836653163 +31363537393732666536666461343135353631653161393230616164393838303531616639303132 +66383366363533323932373336653562626363626530663864323836393231346566333964333762 +36623635363333376436353564343637653665346536613062353831376131663732633233343334 +30663638386130633834366331386334633135643332623462353932656666663337326162373134 +64313838373766633839666163613139636565303865656130343232626261633062643261343233 +39636439633666653831383030663932316663326364373534326566333265656534373262333338 +66343561656337643365623833616534663536373566666436613230383063633466656533396261 +33333965303333616137366137376164616232663666653434396235663062333231653336326531 +36626530643966643165343165656536643934353765323534613865623034666264623536383137 +66656663303962373036333433616361363566356234303864636236353330353265306163393562 +39346139653761663935313437346263656661393232326534326266346531663837313063356639 +31336130616663353365633032366632653365356363373762313039366465643239646164623862 +66613334386239303763313634333134383162373538386530646435636261363264613764306538 +34363339373731386539613938613034633537313032623931363638353138333661356164656630 +38366164636366666430343761376135643533393630343665623830333739353234353933343866 +66653238386633643934663333356332353662643364383539363633653235623633393835316638 +31643265373439343063393238303237663765653861646663663334366162626232626462633233 +63346665303364303333653235356564333439326261616539343739366161356562613639373939 +35623435656632633165323432623737363336656139366662623730383337333763343731303866 +64663735323733626537336665656638346633363530646339633937616164613535313132366235 +39303930313030326132643365363332623061366531323961376230653338356333343763323131 +32303561666632623264343734323461623137633430313134366436306239393534326537363164 +63643936653832613133626665383036356564643634383161323365383139306633373165653331 +62356266643662313061646639383361363230343030333963366333626364373531643430643062 +66393363623861353333303939396437396134393064333538353435353130366337333430613164 +36333562663235633632393530346235353638356238353163613639353266386636363364363639 +30393861633133396165653664653565306531623035376661313235616261373736313365346239 +64663033393664313334643164376138346462306233346664663436653766663466336233633938 +32643832396464373034343866366466323930323063383864313830373462343066396532316334 +66323739653763656138326133393538316562363539323936313866353237303463356665396330 +39613830333663626536346132616431303566623261393333313863373235666165636337363764 +65653062633731346132396561636361383464346166346538646539653062313664663231363333 +35323465393134313362613461646262373037316263353464326463663837373562323564613636 +32303030653762326438613931633461356563366134323861636232326434666236306230633833 +35643661366366353566633934366163653032653431633564376136326331663130303137323437 +37636266613263646165323566653436633130613864313061373532633338386364663736653163 +39633336336532636262663463623237646530376463663331333466386463343831646664363835 +34376565663861613539383765643461656261323939303633663537643462383963363433623230 +35323465386665313264396537373838346666383431356466333035643664656464316564333436 +63616662646164643363643131333738353965383239313334653637343639323431386136303765 +38343162373239313732323333336262323939316639376563356139356363303937656330363730 +33323561646139373733356361366363616364303236646332373966353931663036636233636432 +32653539303430623963643363633566336362306335643034633365643338356535396161303262 +65346365303265636263356535346262663065666664393036663663353139633863383564356466 +62386334613539313831393066393463353537313630626365633232356161633665383130643561 +32643663313162333433363133633539653538623139613564613336316635333036306432323161 +36393338366239316233343731653334636365613435613835336462633965343934303163663165 +63646565323638633032306239646462343833303236363363613532376632363736353261393533 +66393830343733636432646565303936366361386337663162326537316637316564633436636331 +61393037386631383836666137646332366661363434616231313863373439363033633136663939 +61353732303237663965 diff --git a/ahoskingit/terraform/variables.tf b/ahoskingit/terraform/variables.tf index 91bfe03..8587edc 100644 --- a/ahoskingit/terraform/variables.tf +++ b/ahoskingit/terraform/variables.tf @@ -6,6 +6,17 @@ variable "aws_secret_key" {} variable "aws_region" { default = "us-east-1" } + +## GCP Credentias requirements +variable "gcp_private_key_id" {} +variable "GOOGLE_CLOUD_KEYFILE_JSON" {} +variable "gcp_region" { + default = "us-east1" +} +variable "gcp_project" { + default = "ahoskingit" +} + variable "home_ip" { default = "174.114.190.249" }