From 6dd4e575915922f6190eba6120c1ba85478e231c Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 24 Jun 2024 19:54:40 +0100 Subject: [PATCH] Update Plausible to 2.1 --- .../roles/plausible/files/docker-compose.yml | 5 +- ansible/roles/plausible/tasks/main.yml | 4 ++ ansible/roles/plausible/vars/vault.yml | 72 ++++++++++--------- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/ansible/roles/plausible/files/docker-compose.yml b/ansible/roles/plausible/files/docker-compose.yml index 75119f8..d677ad3 100644 --- a/ansible/roles/plausible/files/docker-compose.yml +++ b/ansible/roles/plausible/files/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.3" services: plausible: - image: plausible/analytics:v2.0 + image: ghcr.io/plausible/community-edition:v2.1 restart: unless-stopped command: sh -c "/entrypoint.sh db migrate && /entrypoint.sh run" depends_on: @@ -14,6 +14,7 @@ services: environment: - SECRET_KEY_BASE={{ vault_plausible_secret_key }} - SIGNING_SALT={{ vault_plausible_signing_salt }} + - TOTP_VAULT_KEY={{ vault_plausible_totp_vault_key }} - DATABASE_URL=postgres://plausible:plausible@db:5432/plausible - DISABLE_REGISTRATION=true - DISABLE_SUBSCRIPTION=true @@ -30,7 +31,7 @@ services: - SMTP_HOST_SSL_ENABLED=true clickhouse: - image: clickhouse/clickhouse-server:22.6-alpine + image: clickhouse/clickhouse-server:24.3.3.102-alpine restart: unless-stopped volumes: - ./clickhouse:/var/lib/clickhouse diff --git a/ansible/roles/plausible/tasks/main.yml b/ansible/roles/plausible/tasks/main.yml index b1afd03..0a85cb6 100644 --- a/ansible/roles/plausible/tasks/main.yml +++ b/ansible/roles/plausible/tasks/main.yml @@ -48,3 +48,7 @@ ssl_cert_path: /etc/letsencrypt/live/plausible.theorangeone.net location_extra: | rewrite ^/js/index.js$ /js/plausible.js last; + if ($host = "plausible.theorangeone.net") { + # HACK: https://github.com/plausible/analytics/discussions/4272 + rewrite ^/ https://elbisualp.theorangeone.net redirect; + } diff --git a/ansible/roles/plausible/vars/vault.yml b/ansible/roles/plausible/vars/vault.yml index 03583f4..9e48168 100644 --- a/ansible/roles/plausible/vars/vault.yml +++ b/ansible/roles/plausible/vars/vault.yml @@ -1,35 +1,39 @@ $ANSIBLE_VAULT;1.1;AES256 -36623330646439316466616430343264623037396633313461353763396564333736613964383137 -6265373934316438346633346339646565353161373762380a633362356533323335373337333939 -39363238653233323164653865363934373439656337366638643030343962323731626366323762 -3330636433613934350a363033393832613865346632356461373465643963393133643236653339 -30356630316433373662326238653163343065363762386461613430626466633034386238356538 -39323939336538646233396364343932633436656431636633653931353433626636316430383262 -34626365613136346566653630666562663230386464376463623064623034363331323030346264 -64346538646664303031643962643065333632393333656339623036393039396634376361306266 -61343633653433306533383938666563346464346164393131363138653763616534623361663137 -37646139656134323237643864333132373964396239386637333864323935663333303237306562 -34663330663661363037343266643438626531303936326335613733316263633930623835663934 -64323462313937393737613435363266313864646437623530396132623732636233343932316563 -65356136333230623034653366373662303761623938623432366130656365393063646535343633 -39623333356131666130346336323735613236653732663864653238616335666338343965333034 -33383431386634373833393665343831616562363962363836373731333430643165373463643535 -31396431393433306636656536333262323537616236353966353664363665323234386436303331 -32323532313966656262643836653738333762666438303434393261323530383137373931303362 -65396531346666376538353534303030343339366238383233336263623964303630323537363132 -66653464363263323338623130656436353237326236663830656463356531646264366631623938 -30376130363535326265393362376366303531383336353130303439356266313339656536343361 -34306462653333663935303466313932373334626161656561653164376466323030633632316363 -37616131396130343632313930613339353935666130373461333635366139343366356139393364 -31383332323333373439326537616133306366656331333033376562383533653630343062396132 -38306636373166363932326638343336386638333531303634386262646132633931633563346564 -66623530303263643636353630623031663862343839353962656237353632613862373431653831 -65386239393730386165376535633135643562373262393630343235383233616335333738666432 -38303237623033626463333438633935626132653134373061633961623031323631613732393961 -30323861343766333066353536356138373238326333373164643035626136656166666464373565 -63393030323130356137396636326263343466323332383235306236353439333933666261646265 -66343333643863616363313732633636316131363739346634393738396361386233313632393839 -66303735363863623531346637663661306330303866393137303638656238643062366661663131 -32393063356435646561353131386262346162656665306631393336613034636365383964613638 -39613361333564316134386566306431363438316132653638363565633430636532323564616530 -3431663462336238323038353261626163666530636665333437 +65616364663530613438616435333565633937633839663634333233326430356237353264633032 +6239663766393530633862306533346661376130656133320a313661626331353633366538653532 +37363830353861353433346232616566313139613830646563323936656539306564653361303461 +3862316335373831380a653136316665633964356338623330613130643362356262353137316531 +37376630373632396335363661643363303030633436353936663839313230356663396635353038 +65323135353338623562313031363339656434383036616365636532333831386365376461356531 +61393835626233363633316437386362353935396232373363653137613063363361636433663131 +30303734636330666261353737303466396362616162316235303336316666383830653236393266 +62373166646132313162336537386234393737373965376565636664386230366635663935363833 +34636362313162356638386131363262623930326166353366326361333733653432353835356665 +39326337643035623631346131626136346363386162316334383130343832633866393233616635 +66646664363236386363336438353239663036633837653535313530336337363262333332386262 +39616262613861383032663435393966616536616363356336393364326137393166383936363164 +37363331643235623237666433396633663138623134383634383038353833643531303734306532 +66346631323262386131323234376338393261663434356338653365356262663866636666326334 +35663436643232656563353838363761383030373430376430616565613331353665393635353433 +31616136346333393664363031386131663564376663326665626331336535636434303661353938 +33303365373935353337663361653835323663613063313437356536663664656639343461373063 +61656538363832383933393738623337616530643565326432313634633236633535393838373038 +39316334393963343039646133383138333832636164333565326161663061343433613833353438 +35396330373861343364623333653235333462326338303139636564636635356235323633316135 +38386339353661313163383331643031333132366138323332636563356132316332643134383261 +35396261643364663166303135386266653964633136343532386532613763623163303130373565 +31306635613530373865333236633066363462326431386231643437393564633462313465613230 +35386239396434656234353036323736333132313734333862656163363636663833643630323963 +31396231373734383132316164383138643531313830653132323163366335336131626264303461 +32373964653738653831656261636237386364356435393431623939316235393133383566323331 +65656637373633313637623536646335373264616234376233316135666137306361646565336663 +39336130306661663531306663386333626534313238313632373133636662666231386538353130 +63313766313838383632323733306166343337336234376262323039376230333438356664633864 +39316530356636643437353532333663626532373733623539373537373432323136663236303064 +30666536313264393864306130313362363739306566376332356562363138336531613665306261 +32303964393631383034386666396566376339363263333062356335383935373932356231363831 +30636335633833383734316163303362353130383463303761626536326164643463336663643433 +63313139353331313831616635653135613437376138346534393566643165623861366462363330 +64616266336133333332333034383537376630346365353434666431376437313937386531663531 +31313239336163393634356532613966636437393065656162646138663232396164656266366465 +3631346462643739356333373830336265363131333033363131