From 7de73287fd89097641af82a83448c4bb430c200c Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 21 Sep 2023 14:20:54 +0100 Subject: [PATCH] Move spotify proxy alongside website That's all it's really used for right now. --- .../roles/website/files/docker-compose.yml | 11 +++- ansible/roles/website/vars/main.yml | 5 +- ansible/roles/website/vars/vault.yml | 58 ++++++++++--------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/ansible/roles/website/files/docker-compose.yml b/ansible/roles/website/files/docker-compose.yml index b3e94a1..742aa9f 100644 --- a/ansible/roles/website/files/docker-compose.yml +++ b/ansible/roles/website/files/docker-compose.yml @@ -13,7 +13,7 @@ x-website: &website - CACHE_URL=redis://redis/0 - QUEUE_STORE_URL=redis://redis/1 - RENDITION_CACHE_URL=redis://redis/2 - - SPOTIFY_PROXY_HOST={{ spotify_proxy_host }} + - SPOTIFY_PROXY_URL=http://spotify_public_proxy - UNSPLASH_CLIENT_ID={{ unsplash_client_id }} - SENTRY_DSN={{ website_sentry_dsn }} - BASE_HOSTNAME=theorangeone.net @@ -75,6 +75,15 @@ services: volumes: - ./redis:/data + spotify_public_proxy: + image: ghcr.io/realorangeone/spotify-public-proxy:latest + restart: unless-stopped + environment: + - PORT=80 + - SPOTIFY_CLIENT_ID={{ spotify_client_id }} + - SPOTIFY_CLIENT_SECRET={{ spotify_client_secret }} + - SENTRY_DSN={{ spotify_sentry_dsn }} + networks: traefik: external: true diff --git a/ansible/roles/website/vars/main.yml b/ansible/roles/website/vars/main.yml index b24996e..bccdbcf 100644 --- a/ansible/roles/website/vars/main.yml +++ b/ansible/roles/website/vars/main.yml @@ -1,5 +1,6 @@ -spotify_proxy_host: "{{ vault_spotify_proxy_host }}" website_secret_key: "{{ vault_website_secret_key }}" website_sentry_dsn: "{{ vault_website_sentry_dsn }}" unsplash_client_id: "{{ vault_unsplash_client_id }}" -website_basic_auth: "{{ vault_website_basic_auth }}" +spotify_client_id: "{{ vault_spotify_client_id }}" +spotify_client_secret: "{{ vault_spotify_client_secret }}" +spotify_sentry_dsn: "{{ vault_spotify_sentry_dsn }}" diff --git a/ansible/roles/website/vars/vault.yml b/ansible/roles/website/vars/vault.yml index 9acf5ae..181f2e9 100644 --- a/ansible/roles/website/vars/vault.yml +++ b/ansible/roles/website/vars/vault.yml @@ -1,29 +1,31 @@ $ANSIBLE_VAULT;1.1;AES256 -36303635376432353532636330353063656433363436663336373063653362396238316462333062 -6365643764353136373064623662653731343135343036310a333864386563623934316532633234 -66643232343936383134316265336237306364346335313163323465393265633239383763346636 -6638616635373531630a376534663138343963613530636265323731663132626265383538343065 -66343932333632643632313563343163393832363633383032643330323434323438393333643230 -31653362653761313938333437616638363665323463656264353265653137323537306665616331 -61613437393131383735313034326237663230643834356463356637626431353561663635613962 -31336537306537383437623939396636613131383061383434373436333931633039313130613237 -34663935613165626236323238646264346530323339303633626261393338363965653861323134 -33373833663737623939666366373962313935363161383564313435373138666534666330346334 -35623032636362646635363361616537626362626262333437373932646439386562643832343535 -61646532643134656638323130613236393138376363373437343232353231326131636232356636 -30396262313439616533346230356339376134653939303138313831333935616238313035613432 -65633935646136613538633466306362643535346538383534383761363937373332333739656363 -65643338336234643238643035393663346431306137393462636430653932333363303764306634 -61643335383235356262653864666266666535393233396162366630613261326666653835386339 -64313066303537623163333937626231623063653831386338303338656263313266396637646331 -39333839363764366235336230326432373732383433393766343765346531633565383635343235 -37316631396464366235323034356161343263376461393533633061643736333365376562306130 -66326165613939626136306430306637626139343166626333343139633863633164326238643863 -39636534653166646666373034643439366461636530663239633864633737666265356666383137 -39356437303964656634326435326232316265366564373537333538313163373132316438323064 -30333130343965396265323663363765336366366637366163396663376265376431623839373363 -61393065326433393235633338333638333631633136356462333637373739343432623834636238 -39393465353538653233316334623337373662656331643330613565613333633865663962346137 -32333235303331623432306265386437613061613438373366306235396539663464383835613930 -37343864336630666439356164663061373066313063313933643062326239326131383531653366 -39363136623861386637 +33653634653234626661383438393836636337626534303963393336383938363463333039343437 +3735636566616464313936626339323931373633353430620a363830336137313538353432356665 +32313263373561313638306235613165646436313563363361383037646263386466303937306564 +6137343466643862310a646236306138656562313432363762613737333665343739653535613763 +35373165303235363265623630663831356335363432613463356635383833346238306435346538 +37356161323831643832336162633263633435303264376335666363663738376234363135336538 +62383831333262663733663132346262323665666365303931333265376237613962343437646332 +31643633343461623863393736393030346639656239636435323338393865633934386561373663 +35663765306631333231356530623264336562666263363333316638623662373337386435666262 +30393230663432326261383834623432313435366563343065383130316233333035353433343036 +62633834626236323830376132616639396431393039393236333162663232666531616662376437 +36316531653162346638636537303239313863323462326636306634306235396239653630376161 +61656561646666633934373962373965333534613465613265383866376135653533333563386530 +63336361616330366633373763626234626430613064623232626439363830333766383739326238 +61336564333538646164623330353336383063663936376635643766383864303730363930343435 +38336436326435326535663032373762343436383437653537303134373433393335303533663161 +63636463386236383035626439613831396337356639316332353030363235376633336165333166 +34633636643166373335366135613263653638656332653939306565636666323163663639373430 +64376461363061643130313765643261396666313535653437323431353838336630323363393566 +36626233326361333139313232363431303738343830653230373162383230326132353135313036 +35383037303536666131616566373365623236343663393539336234663762666238356639656230 +32623831643232313637323464663930363235356262666438383433396331333561363035613539 +36373166663833626462353162303638386163653831663838613437306435376161343132643261 +35316331326639383936356237643035383135363565343761316566643463633364336234343063 +61626130646463353134376437326565643166613334346362303037356264373339656564303538 +36343561623137313364633834363831393735356265633661303137323231313964343862663937 +32343665656166363534363832373132333061376130306166306432633464396436613238343463 +36306162333162336139396665656666343233663663646464613663653934363337373536326335 +36656338656564613035313365396233626565633462663165333533663764323737666431666539 +3036353361376639316138396331396161623731346635333035