From e654daa52a315a8e5de76889f6a2d6b854a17dbb Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Thu, 25 May 2023 10:24:27 +0100 Subject: [PATCH] remove tubearchivist --- .../templates/photoprism.j2 | 2 +- .../templates/vpn-stack.j2 | 75 ----------- vault_vars/qnap-vault.yml | 116 +++++++++--------- 3 files changed, 60 insertions(+), 133 deletions(-) diff --git a/roles/setup_hosted_services/templates/photoprism.j2 b/roles/setup_hosted_services/templates/photoprism.j2 index 08524b7..9fbe64c 100644 --- a/roles/setup_hosted_services/templates/photoprism.j2 +++ b/roles/setup_hosted_services/templates/photoprism.j2 @@ -13,7 +13,7 @@ services: environment: PHOTOPRISM_ADMIN_PASSWORD: {{ photoprism.admin_password }} # INITIAL PASSWORD FOR "admin" USER, MINIMUM 8 CHARACTERS PHOTOPRISM_AUTH_MODE: "password" # authentication mode (public, password) - PHOTOPRISM_SITE_URL: "http://localhost:2342/" # public server URL incl http:// or https:// and /path, :port is optional + PHOTOPRISM_SITE_URL: {{ photoprism.site_url }} # public server URL incl http:// or https:// and /path, :port is optional PHOTOPRISM_ORIGINALS_LIMIT: 5000 # file size limit for originals in MB (increase for high-res video) PHOTOPRISM_HTTP_COMPRESSION: "gzip" # improves transfer speed and bandwidth utilization (none or gzip) PHOTOPRISM_LOG_LEVEL: "info" # log level: trace, debug, info, warning, error, fatal, or panic diff --git a/roles/setup_hosted_services/templates/vpn-stack.j2 b/roles/setup_hosted_services/templates/vpn-stack.j2 index 4ffeeda..dcd4b91 100644 --- a/roles/setup_hosted_services/templates/vpn-stack.j2 +++ b/roles/setup_hosted_services/templates/vpn-stack.j2 @@ -113,81 +113,12 @@ services: - {{ directories.downloads_dir }}:/downloads restart: unless-stopped {% endif %} -{% if template_vars.tubearchivist %} - tubearchivist: - labels: - ie.cianhatton.backup.enabled: "true" - ie.cianhatton.backup.schedule: "{{ backups.schedule_keys.nightly }}" - container_name: tubearchivist - network_mode: service:surfshark - restart: unless-stopped - image: bbilly1/tubearchivist - volumes: - - {{ directories.youtube_dir }}:/youtube - - cache:/cache - environment: - - ES_URL=http://archivist-es:9200 # needs protocol e.g. http and port - - REDIS_HOST=archivist-redis # don't add protocol - - HOST_UID=1000 - - HOST_GID=1000 - - TA_HOST=qnap # set your host name - - TA_USERNAME=tubearchivist # your initial TA credentials - - "TA_PASSWORD={{ ta_password }}" # your initial TA credentials - - "ELASTIC_PASSWORD={{ elastic_password }}" # set password for Elasticsearch - - TZ=Europe/London # set your time zone - depends_on: - - archivist-es - - archivist-redis - - surfshark - archivist-redis: - labels: - ie.cianhatton.backup.enabled: "true" - ie.cianhatton.backup.schedule: "{{ backups.schedule_keys.nightly }}" - - image: redislabs/rejson # for arm64 use bbilly1/rejson - container_name: archivist-redis - restart: unless-stopped - expose: - - "6379" - volumes: - - redis:/data - depends_on: - - archivist-es - archivist-es: - labels: - ie.cianhatton.backup.enabled: "true" - ie.cianhatton.backup.schedule: "{{ backups.schedule_keys.nightly }}" - - image: bbilly1/tubearchivist-es # only for amd64, or use official es 8.4.3 - container_name: archivist-es - restart: unless-stopped - environment: - - "xpack.security.enabled=true" - - "ELASTIC_PASSWORD={{ elastic_password }}" # matching Elasticsearch password - - "discovery.type=single-node" - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - ulimits: - memlock: - soft: -1 - hard: -1 - volumes: - - es:/usr/share/elasticsearch/data # check for permission error when using bind mount, see readme - expose: - - "9200" -{% endif %} volumes: {% if template_vars.jackett %} jackett_config: {% endif %} {% if template_vars.qbittorrent %} qbittorrent_config: -# https://askubuntu.com/questions/1203832/how-to-mount-smb-share-on-ubuntu-18-04-with-read-write-from-the-terminal -# downloads: -# driver: local -# driver_opts: -# type: "cifs" -# device: "//192.168.178.42/downloads" -# o: "username=cianhatton,password={{ cianhatton_password }},dir_mode=0777,file_mode=0777" {% endif %} {% if template_vars.radarr %} radarr_config: @@ -195,9 +126,3 @@ volumes: {% if template_vars.sonarr %} sonarr_config: {% endif %} -{% if template_vars.tubearchivist %} - cache: - redis: - es: -{% endif %} - diff --git a/vault_vars/qnap-vault.yml b/vault_vars/qnap-vault.yml index e04cb68..d1faad2 100644 --- a/vault_vars/qnap-vault.yml +++ b/vault_vars/qnap-vault.yml @@ -1,58 +1,60 @@ $ANSIBLE_VAULT;1.1;AES256 -62656461643734666662633533643533333034343466373461346263346666353262313066663065 -3262386232666364333931303462356666326631623461390a306665656239616238626665633731 -61343262303561313730616164353065626635353161363564346236333531313335376237333032 -3664373430633537340a396637336535353862306463316262383936326662376338373662383232 -61373130623165643366643461613566656430336533306666643130643936363263353065623865 -64656535376535323533326334363966353839353838643066323662313937373865336565656439 -39393938356335303664376631356436353233383063323630623235306138376333373164353432 -61333565316262323863326631353563663936376635656632643461316465333034616137326166 -31303866643932613935623737373633383064653333383561663434316430313761616532383964 -65616462373066653462653361306338643738356663333163616130363034313034643535646631 -66623030393537633366396264623130373036643134356237303763303636393066356635353638 -32616438663134343439363764343633623637313363343931613231313731306537646335633132 -62373937323165336235636530646261343336613030326361363466316530343861396230366239 -31326334643766396563613162613662656163653833663638653333623163336630303430366334 -30616634343433383630613965646137333738386465353862366265383432353937353665616365 -37646335386661616466656461333365366336623064616639663530613536643138643339333761 -33376434356639626631626663383533303136643264653864623562366438653239643933666161 -62396461343666616130633562313739333966303936343637646335396233626435306137393530 -39643962653063356330353661393635363339653433323366646338376337656630323235636639 -31316437613264373764643939653434353234623634643234366532626339353530396536356164 -32373466393334643965616438653337666162313432316161313730653461376331373833343730 -33613332613566616161376465376463623064393464303731383736643638333862303562313531 -31373738393865613764353733303430373234343939386263303733383565316264363939343331 -63313938663732313061303166656337643062313131396161383239636136383961623466353538 -38383962613662643234393032306264393038306538333161323633396666383839663235303366 -34376638356135666634613561653161323037306363616161353663303535353836646633633463 -30343131636332626337633533396534616264626130333930623737316562313834316562373637 -65346233316230623830303833623537393134313965396666316434373065373562333138383635 -39323237383462333139626134393532666133643562336331613039616634313637623262353031 -39646539336636636432313138303837626261326437316362363739303637323965393138353034 -66636539343261343234323135316263326333633266386163373761383936373034306662373262 -61656433396139343436336633373261326135626233336432366234643666623935363566303061 -35653463636637373261373030383231633866666665346263393931623731366232646534633237 -39393139656165396630393135393736363735643533336663303632346362353032653432656538 -34343731643034633538376265383863343037616464313834353030633839383239386335313631 -65643834336465353431363338626664623436376238663434366130646539386230383935366539 -65306532616536653338303334306137326430373564333434633263323832643366393430303761 -31613534386438346437353539356336653133303066663964336235653334326633663562343538 -33303165373436323032653635363565333539666564333734656362363663373130313165303434 -64393264356665643963616161313831363165666539373631626530393561393234376562643764 -32343635663766313934656261356438663930306338343533373162306338303032346364363234 -34356461303737653638323335333862393535313762376233323033393262393632623262323633 -35626463313364303638353337643135656538633165663437613233656630633933633633376138 -36376333313537326630303861663231316264306563643262396635303437616664356465626363 -64343163353864393161633633303831343431313930653365333732363836363432623136316462 -32666262356235613262623564323764313330653538353263336561383331373932333338363963 -66316632643662356237643332313831353031663933313630373030383166663066383964646365 -62336462363035356538623935353161353666643066396561316239663137346135313732346465 -64326635633739363066346539333431333562653537386162613130303166366330633863623065 -64353861623931663830633230303332306632376331336430356163643536623864666335346464 -34636166613162616339313334353236386135653239656338393231663264636666616263656530 -31623330623333633237396366626663326662356539303637366664313130373231646233303233 -64653834663432316264653665313232663433653737303036386237326236356663333431306263 -38653635646134633537396263613634326566626533653862623763653061613565363564633236 -39343736663234623935663434316366633534626339643664323463613961313830663566336237 -34663332383662313535646361353262353866616134616162396538323437613362303534303761 -6662 +38623238336461636135303262393366616530313338653133343133653033656639396365623062 +3537643864303138666465653661366433383163636132610a333261663866346535373464643333 +37303736326266353136323966356365366161356433326363353137303065346333613863633865 +3964326337653131350a623039623361383336616235626430633339383138623761643862613530 +39626334346234353739316135356239356534393837363165643336373663633131623035653861 +31333862393331663333316262653863663962393236613937333264393739663339323536613761 +35666163336364643932386234636238616462326434323733383036383362303538343834396362 +35656437343661353034626264643036333939373835643538613238393462393230323836666334 +35313733663263613266393538623939306434613139303333366361386436376639653066626134 +65613535656134636464343332343232636338316336306638656333376432613566333433343433 +32316232346630336335363634656234356464613936663136376130643132646338626532363937 +61396339633366316438363937663661363336383939366232326466626633633866373965633937 +37346664663037366237613030656463343333346130303434353831303166356264343231663666 +61306662386333366239636338626461623465316634343362646662646336623736616363643636 +66393338376262653439623731663735353633373437343361333733346630656365303230316135 +37353934623862363261356535353263343830623363346137386435376363353334393062306236 +33333366663837313862323733353539613438616233353930333030366635383436656366306166 +32353661346532656564303963646661346439303535633862376331333566303331363336323465 +35323231303165353463376262613264623936623761303034663737323537653863383038346262 +65356130373337393638326361343764333738353536393836623562383363386236363831663536 +64666165346337313365383237363062353330623938363830366335313638636435303861313236 +39333236653731323364353961343264383033346364643032336533343330616330393634386265 +32376561386535636566343430333133386536663431393935643962383538333439343036613665 +34396436383466323733353262356531366232663338366661343464363565326239646664663832 +35313363363138356135623764346132663162393261303662643134353430313065636235353563 +64376436346461356539343664316337326439626466663833313861393636383631616165653135 +37376465376339633566616336636439376265326565303730653533393931363630643761663539 +62373461663266613939626330393336316561316261646531383932373964613939666264376564 +30363835383263313431376130616461646663663638386564633730636536373461643362363031 +34343134376364653363396133336465343266613364393461613462663661383831363962333964 +61343661653039626566376431343839386633356536356137643466626566356366666231623639 +32383936356639353063613132363733306161663434393862313433666266653035356330303962 +38333965303565303134663937633065653462373161653138343833666336303232343036633764 +39336139623565313366656564333238386533616432336465643936633863626337613430356465 +61346661323766633666633235386339353731323961656266353039336634383830343634313630 +33636637376162343462353535343665303364663633636631386134653133353335646162396662 +37373833333439316463336136396562636362303632333266363233326164623837383261633565 +66313662323133343631616366666665613466666136333661636161333436336532306337623435 +31366639653163396263386265346336306334623139386231313032336530303233303035643932 +61666232646338343433383632383861623062366531366530393162336261323831373732623532 +32346165343861366666383434313263636338313831633038386431666337366234666430393537 +39653661373232623337326537663263326137643032386339393239313965656439306662643163 +39353564643432643239373261393436373932633535636361333332353261316238393030393431 +62386238653438356239616432393638346335346662643265616331633166373133376439653763 +64383039356335633563336361613463363065326133386434353236353338613330646139336434 +34636362353530383538356530356334623766306263636132653366656561633833386639306365 +65343638643034373064363835623231343830626531613134616237353361323031373862316136 +62376337616230646430653066646539376562336439333331393031646363333237636331336530 +64316339333532373430303634663433303635626664636333646232306564653561656363373231 +61663338333632326636346338383338353537336539333061323634303663653465613837313363 +39643234323836343566303139313038373333656635666336653533376536646538303733353631 +33373138386266343264366134646333633732303536663463623162656130313938373038616462 +32303330336631396639653136633332333130356330333162343835376564303733366366366436 +30623462373732653263633339396666343932396661343862316631623830316435623334393462 +66343966363332613762373530346538323536333161636530623936313664353636316131323165 +63613730326461663830643866393634316366613361343361646533343561653064643034393736 +31316430313138656437316432313233376537656366643063653831393662393032313730326132 +36323562393966346232633031383934613335663166366665386535336131393237303862363731 +366461373832643239393363396264323134