From 3ccb98fcd4a36a7073a103734ee23535973e9543 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 7 May 2023 14:58:24 +0200 Subject: [PATCH] replace syncthing with nextcloud --- playbooks/laptop.yml | 4 - playbooks/os3.yml | 4 - roles/syncthing/files/laptop/cert.pem | 45 ------- roles/syncthing/files/laptop/key.pem | 20 --- roles/syncthing/files/os3/cert.pem | 45 ------- roles/syncthing/files/os3/key.pem | 20 --- roles/syncthing/meta/main.yml | 2 - roles/syncthing/tasks/main.yml | 49 ------- roles/syncthing/templates/config.xml.j2 | 170 ------------------------ roles/syncthing/vars/main.yml | 77 ----------- roles/system/tasks/main.yml | 1 + 11 files changed, 1 insertion(+), 436 deletions(-) delete mode 100644 roles/syncthing/files/laptop/cert.pem delete mode 100644 roles/syncthing/files/laptop/key.pem delete mode 100644 roles/syncthing/files/os3/cert.pem delete mode 100644 roles/syncthing/files/os3/key.pem delete mode 100644 roles/syncthing/meta/main.yml delete mode 100644 roles/syncthing/tasks/main.yml delete mode 100644 roles/syncthing/templates/config.xml.j2 delete mode 100644 roles/syncthing/vars/main.yml diff --git a/playbooks/laptop.yml b/playbooks/laptop.yml index 05d4685..66bd993 100644 --- a/playbooks/laptop.yml +++ b/playbooks/laptop.yml @@ -11,10 +11,6 @@ tags: [alacritty] - role: neovim tags: [neovim] - - role: syncthing - tags: [syncthing] - vars: - syncthing_profile: "laptop" - role: keepassxc tags: [keepassxc] - role: wireguard diff --git a/playbooks/os3.yml b/playbooks/os3.yml index 6371d9c..8af1f93 100644 --- a/playbooks/os3.yml +++ b/playbooks/os3.yml @@ -11,10 +11,6 @@ tags: [alacritty] - role: neovim tags: [neovim] - - role: syncthing - tags: [syncthing] - vars: - syncthing_profile: "os3" - role: keepassxc tags: [keepassxc] - role: signal diff --git a/roles/syncthing/files/laptop/cert.pem b/roles/syncthing/files/laptop/cert.pem deleted file mode 100644 index 80ce40b..0000000 --- a/roles/syncthing/files/laptop/cert.pem +++ /dev/null @@ -1,45 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -66646338323135646333656465636533393765626338303565346532623762383266393163623861 -3234303035383839303466363733393231383134333066640a663330653664326264376536373537 -31363061343434653231353837333064356333626633636630313133353738333832636435343634 -3431346261656539620a393832386639623431613566636433343734383330623165626464303536 -39393562343666343234366163656538666236643532333237383336393963666163396533343533 -62316430623238306162303666323637383361323066336461653835306666323534306438363430 -36653762643664613131373964343331316437396136643866323636333837643730366530653436 -31313361303036623235323539366535643333636634373633356336313434646165363633613963 -39613031643664366364326535353864616333356235666131363437343631623331666466333730 -64643636303363353639303336353661336339633334386561313761663433393031613563303263 -36393463343061376664383665303333326235356466353236636631313933656337356530623030 -33346139343732396663666361663039623931376533363530666365383530326432656365343562 -32303035336566313063383364643764326533356265386434646663663738343532623835346561 -33613633383031643638396332313837643430383164626539376466316466626238613539306331 -62643734386538336639333862363736343532643762393766323531366631393738343339326230 -38396336313738636663663961303061306361373132616330636430373766623266363135626632 -36343638316236343135313535653232343031616534366232313831353233643433643565343662 -31653063633932613631353965353633386234306235396130613030303064623532643930386364 -62353938616665633738613335316563616537656332386236306666636639326138343034323837 -66636637663664373434386363313563323061316163663236613963323436353532613766363636 -35646530363666616131383732393862333938353065636333333164366635616234626262316431 -36356664366465646233656635666330303338323039623433623530643964376664333565363862 -36316463613664643534346536636637363435653962633438333437346236663032626639333539 -61663135346430336238386366383935383763653731306561313135316437613161343763316430 -33643161363139643735373138623535333438656239376563366239643637653162303461313163 -36343762353863326161636637623066383036336630306632333736626563323661623534336437 -61303962633163663936613430616163666139363063313964353232376337653235303064336466 -61653330636338393130623165636433393566373739363031393235613238333834313135313066 -31303435666635316561383066336637646564323564653462323661666136316532326562326135 -36613930303832373066366263313666366666313536373064376433346435383630613234393830 -66393564346238386631346539646263663635353935386336386232613734343935346264303234 -36383265383931316137353733306235363237353934623835393062353633346438366235303730 -30666539373633313966643335376663363137393231636438353564343436636166346462633031 -34353733373563633536336637643966353233663466373932633339313432653538346331633535 -31363730376563646232386431376537353531356432306635306334636662316539616264616136 -65363933336365376635333933313561373063346433666464313765646162363264643338363764 -34333231353265363935313739663131333565666639336234656639616464623165396464613863 -33376131666231373961613561633065653366393532393736363935653065636365363564326364 -61326238313466616630623737646263613830616537383364633735303861343335613635383035 -36383165363939626639636334323866353235656165343636653732393832356665643735636663 -35336665653065653633363366623463633039366432333066363561633566643937303437613435 -38313265613362356662626563633764646164323239396136356538636461613631323035363039 -33326363306566303936366232343062643037366531376365356461396664356561343162363134 -36343332303830336562 diff --git a/roles/syncthing/files/laptop/key.pem b/roles/syncthing/files/laptop/key.pem deleted file mode 100644 index bcc4f81..0000000 --- a/roles/syncthing/files/laptop/key.pem +++ /dev/null @@ -1,20 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -38373533323538326261326561623834613861653835356234633731366661383364316633353838 -3636313066663636386130336232373233666533353362320a366136653766656333653932396663 -33623066633132366162393963393038613634653933646437613935316365383665333035376132 -3430633230313139330a376530323866626635303534666630666339393164613865376535386163 -65356539643863373130333835613731366237613633616662363861353735633065623762653363 -35653063613461623361336564626365633238353939373539623836626134363438623836353830 -33613237383831373166393731323337353934346334313131306130376535653138666435393236 -36386466333637396139306436306333343437643565626630316433613061373136646436643933 -34383834636561316435623137303834663330613032313366396565336261646363323233633330 -38646265323439303039333266393434623931623736333932633130376335353831356231646666 -30353930663164663734353264636530323166393237626631346333303238613833313736346532 -32633132613134613032396530356437396138613761383737613532396534386465393338346138 -37326437653039633132616139396234633163336566633138343865613436333862393033393839 -31303136373130636538343535626265666364326432656166383062346337373233636561313765 -39633332363931323134333734353634666461393734626338343037323234336136643138353736 -38383537366539386166326164653038356639626264313938613266306464323166393931376563 -62343338326330313132643634613262353739376239643037626137386530386631383438336663 -66653130663563653138306235653030333738396565373066643835333663663662343538376132 -376230386465353039383632643034653434 diff --git a/roles/syncthing/files/os3/cert.pem b/roles/syncthing/files/os3/cert.pem deleted file mode 100644 index 0d0d585..0000000 --- a/roles/syncthing/files/os3/cert.pem +++ /dev/null @@ -1,45 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -39323562326337633131623830353663626538646436616535383534363862623439353966373065 -3333663932336566623865663130633030353761656639610a346163363232373563626265636231 -35383439366632313962383035356461306461643066633932636130383232336533393961613131 -6361333235626538620a366166303563623762386338303862323930373730306264363261376430 -32376233363837653932366137636330343562376566383566666363616461383134643962353635 -61613639326366346135623139326435643832323836376639313864396362353830616334383431 -64333766643435626337653130396566653765633239663039366431393638316238316539353836 -62333837393633623035343064656465376531353933376632363936316338366634366462323833 -65646234663634313631623964613036383864346164343134613237333434383838353230636164 -30373336323363623030303862613834626162303633376264326534663439363866316139363135 -37646432306331333362306533333665643131346636353666613332393937383835323431356366 -30386337646436366362333962663534656365316637653366663566646665383737656130393437 -62316462366238353230323737353731616331616366303066643564363562393938636265366139 -36343034353034306563373135333632323866326330313632666666353933653065336463336533 -36313631633836646434636236306262323734346339373533396433633334333364613263393064 -34633162373538623038343535306431306538303164313763326337313765303136353962323364 -63623963366531633339306631343038666131656462616634666631343237353939633531663632 -61376130613735336465366533313130356636636434636534373962336637616530666137666135 -32616565373665316536313163386463646362336565396366373233376462303065353537613035 -37323637333537396239613936363833326535633466383934656465366538646564373634396338 -35353737633564336661616439313735626663326536666531383164303530353635326632343230 -37313236326639326639306465643366633030663163383165323930313634623762633164383432 -33653263376233386538323631343135383262616664356239663538346236333365616234393036 -64643235343338633533303935383931356561343663313634663836656464663031346663363863 -66633630373338383132343363653864323262386135343134376435343862363262613430616466 -65623839356234383362383331373534356532633235366231343538323331623661356163616639 -39306331623663623533386336356466333337376639313231646161373164313565323830616663 -62633931666137666462646663613962386562323264313833303561313262323232666263663331 -63616666356238633337356233653837376562656130356263303538346230306266313863393830 -30336366643762613164353164323165643733393334313134323662323239633133303636616265 -61336438333066323335656565326330663461626536653035393863613231363135643263666632 -63613461653961313936613035313933353231346432373738363561353632396139383234396432 -37323639663835323634323231306233656337353437373162366565396530363566383663306431 -39373765373335643837633236363135363038613533306235643937356464393063326436623463 -65323861636565623934393537366537376664346363643134396136643336376238633666373132 -31316330376565653531386666343038373562636566343266383665373866373862333131656539 -63373536323863666663353666653131346638396665616633353437326336343231303837383164 -65626237636634383661353637636230633163373461626536393938613462346331313635333131 -34646665653533643936363764623536623563336466386264616566306239313763303838313664 -39636438353166393038383862623764376534646638653534326539343766623361643230323762 -63333735633034326266393832643931633632396632383831376666326439616266383961353237 -64376534323234343962326161633230656264303763623737613136633734366661333632316134 -39366131353834653333636139393334646336616631623264653163343932666137393538316239 -64303139333535363431 diff --git a/roles/syncthing/files/os3/key.pem b/roles/syncthing/files/os3/key.pem deleted file mode 100644 index 587deae..0000000 --- a/roles/syncthing/files/os3/key.pem +++ /dev/null @@ -1,20 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -35346439383133353933356233626365393230353664376566303363323130376338333236353337 -3336306236326233633635653933646266326466653163640a643062623932303861386536336361 -39626435636636353866316430383761353437653861383030653335613131656165643238656364 -3434313330613937390a386333633863326139383135363837643330653539376164626161336532 -36396330626633323466653032383765613136663861386165663039643637613566626332343033 -66356566373833633831343266336231353032646663366363386466323136303230383231656663 -63323263643931373731613163326561386266383464386330363265383831323034343435336532 -62363962656664376635623034653932396163333165346366353730356439393932383032323733 -33613637373534613163393433336263646239343430313665663830313834356531316261656439 -30666666303734366333346138613866666439353837623334306535333636626632313836303631 -63613464336563623837326137623337343031613462376437643239666364316230653031653039 -64666138353864383236633534666536303139636462376338646633623032636530343536323336 -34643632623538353963313038366562303634643766613865343330373562336665613334343335 -62313439396166326537383735323566646432393536366336633632663438386537353865646536 -30396430616539343364663630316435363635353632623836353061353765316462643963393134 -39393239646462383533613163313964323833306135303031363964383466383530393833386138 -31363531326133353438323836323936323636666264626238396639663939353661323235613562 -32356234353030303538653735336164643839323162613261396362376262346138346163613630 -613435313033633738313134333966383933 diff --git a/roles/syncthing/meta/main.yml b/roles/syncthing/meta/main.yml deleted file mode 100644 index 9711b33..0000000 --- a/roles/syncthing/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: common diff --git a/roles/syncthing/tasks/main.yml b/roles/syncthing/tasks/main.yml deleted file mode 100644 index fee13e0..0000000 --- a/roles/syncthing/tasks/main.yml +++ /dev/null @@ -1,49 +0,0 @@ -- name: Download PPA signing key - become: true - apt_key: - keyserver: keyserver.ubuntu.com - id: "37C84554E7E0A261E4F76E1ED26E6ED000654A3E" - keyring: /etc/apt/trusted.gpg.d/syncthing.gpg -- name: Install APT repository - become: true - apt_repository: - repo: "deb [signed-by=/etc/apt/trusted.gpg.d/syncthing.gpg] https://apt.syncthing.net/ syncthing stable" - register: apt_repository -- name: Update APT cache - become: true - apt: - update_cache: true - when: apt_repository.changed -- name: Install Syncthing - become: true - apt: - name: syncthing -- name: Create Syncthing configuration directory - file: - path: ~/.config/syncthing - state: directory -- name: Copy Syncthing configuration - template: - src: "{{ role_path }}/templates/config.xml.j2" - dest: ~/.config/syncthing/config.xml - register: config - vars: - profile: "{{ syncthing[syncthing_profile] }}" -- name: Copy Syncthing private key - copy: - src: "{{ role_path }}/files/{{ syncthing_profile }}/key.pem" - dest: ~/.config/syncthing/key.pem - register: private_key -- name: Copy Syncthing certificate - copy: - src: "{{ role_path }}/files/{{ syncthing_profile }}/cert.pem" - dest: ~/.config/syncthing/cert.pem - register: certificate -- name: Enable Syncthing - become: true - systemd: - enabled: true - name: "syncthing@{{ ansible_user_id }}" - state: "{{ state }}" - vars: - state: "{{ 'restarted' if config.changed or private_key.changed or certificate.changed else 'started' }}" diff --git a/roles/syncthing/templates/config.xml.j2 b/roles/syncthing/templates/config.xml.j2 deleted file mode 100644 index 3163f68..0000000 --- a/roles/syncthing/templates/config.xml.j2 +++ /dev/null @@ -1,170 +0,0 @@ - - {% for folder in profile.folders %} - - basic - {% for device in folder.devices %} - - - - {% endfor %} - 1 - - 3600 - - basic - - 0 - 0 - 0 - random - false - 0 - 0 - 10 - false - false - false - 25 - .stfolder - false - 0 - 2 - false - standard - standard - false - false - false - false - false - false - - 1024 - 4096 - - - {% endfor %} - {% for device in profile.devices %} - -
dynamic
- false - false - 0 - 0 - 0 - false - 0 -
- {% endfor %} - -
127.0.0.1:40465
- {{ profile.apikey }} - default -
- - - tcp://0.0.0.0:38639 - dynamic+https://relays.syncthing.net/endpoint - quic://0.0.0.0:38639 - default - true - true - 21027 - [ff12::8384]:21027 - 0 - 0 - 60 - true - 10 - true - true - 60 - 30 - 10 - 3 - 3 - {{ profile.usage_report_unique_id }} - https://data.syncthing.net/newdata - false - 1800 - 12 - false - 24 - false - 5 - false - 1 - https://upgrades.syncthing.net/meta.json - false - 10 - 0 - true - 0 - https://crash.syncthing.net/newcrash - true - 180 - 20 - default - auto - 0 - true - false - 0 - 0 - false - - - - basic - - - - 1 - - 3600 - - basic - - 0 - 0 - 0 - random - false - 0 - 0 - 10 - false - false - false - 25 - .stfolder - false - 0 - 2 - false - standard - standard - false - false - false - false - false - false - - 1024 - 4096 - - - -
dynamic
- false - false - 0 - 0 - 0 - false - 0 -
- -
-
diff --git a/roles/syncthing/vars/main.yml b/roles/syncthing/vars/main.yml deleted file mode 100644 index 66f3c09..0000000 --- a/roles/syncthing/vars/main.yml +++ /dev/null @@ -1,77 +0,0 @@ -syncthing: - laptop: - apikey: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 63616464333437376436333362353263396536633733656431363563626364346536376331646531 - 3762666230663933633937303130356238343963323030320a643639353833616666316536326434 - 65333136656530353062303434633830343765613937386134303463323730666332353439343762 - 3230356330333565630a336239646134333364383165383662393735306566666662623237663164 - 35633538303738366538666466626666633431363134633963313739623231363065653936383131 - 6637636561393762323431303430353661396162393463646636 - usage_report_unique_id: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65636631303566326435306335663363393362613565326638666336353139376538343631663365 - 6666643239396464326438353438323033343334363731340a376638633564626563373866353132 - 30306363303664363233303533653232386264666432303537313630373636613061633237373930 - 6434346565383833300a316334663965353066633234636564653366326436663163363733616439 - 6666 - folders: - - id: "6pgsm-opvsv" - label: "Sync" - path: "{{ lookup('env','HOME') }}/sync" - devices: - - "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - "QW4NXKY-Y56F7ON-SIABMBI-EHMQANC-AVWEREO-B6WNTCN-NP2O7VI-6SGYMQS" - - id: "gfx9s-zaxrt" - label: "Music" - path: "{{ lookup('env','HOME') }}/Music" - devices: - - "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - "QW4NXKY-Y56F7ON-SIABMBI-EHMQANC-AVWEREO-B6WNTCN-NP2O7VI-6SGYMQS" - - id: "tj35a-felne" - label: "Keepass" - path: "{{ lookup('env','HOME') }}/keepass" - devices: - - "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - "QW4NXKY-Y56F7ON-SIABMBI-EHMQANC-AVWEREO-B6WNTCN-NP2O7VI-6SGYMQS" - - id: "sjpmp-qavt4" - label: "Uni" - path: "{{ lookup('env','HOME') }}/uni" - devices: - - "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - "QW4NXKY-Y56F7ON-SIABMBI-EHMQANC-AVWEREO-B6WNTCN-NP2O7VI-6SGYMQS" - devices: - - name: "Server" - id: "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - name: "Laptop" - id: "QW4NXKY-Y56F7ON-SIABMBI-EHMQANC-AVWEREO-B6WNTCN-NP2O7VI-6SGYMQS" - default_device_id: "QW4NXKY-Y56F7ON-SIABMBI-EHMQANC-AVWEREO-B6WNTCN-NP2O7VI-6SGYMQS" - os3: - apikey: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 32653230666137343364326666663236393131613734366464386461373364376636346265306639 - 6434353439633730343936323536653138353565376232650a616363313339383162343336663234 - 39623465306630623338393637383232353236383164376636313236663065326661616166366138 - 3230333933653262640a623734666464636237383732323864353135633936656336366264313064 - 35396666373238323262363133393861653533396633653833653233373831616462663061393361 - 3630363063373638613632303234363637653133356162666366 - usage_report_unique_id: "" - folders: - - id: "sjpmp-qavt4" - label: "Uni" - path: "{{ lookup('env','HOME') }}/uni" - devices: - - "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - "VL7HPMP-CKHKLPH-MHSN6PG-MFGKPYP-RBEMD3R-RLXT2ZI-KU36NKF-TRK5JAU" - - id: "tj35a-felne" - label: "Keepass" - path: "{{ lookup('env','HOME') }}/keepass" - devices: - - "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - "VL7HPMP-CKHKLPH-MHSN6PG-MFGKPYP-RBEMD3R-RLXT2ZI-KU36NKF-TRK5JAU" - devices: - - name: "Server" - id: "IGS4TYV-TQ6X2CG-OE3M2RE-DKZWKQZ-HEKIGHT-C6EIGHL-CBP2ULE-M3WZ7QC" - - name: "OS3" - id: "VL7HPMP-CKHKLPH-MHSN6PG-MFGKPYP-RBEMD3R-RLXT2ZI-KU36NKF-TRK5JAU" - default_device_id: "VL7HPMP-CKHKLPH-MHSN6PG-MFGKPYP-RBEMD3R-RLXT2ZI-KU36NKF-TRK5JAU" diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml index e2941c7..fbc1316 100644 --- a/roles/system/tasks/main.yml +++ b/roles/system/tasks/main.yml @@ -19,6 +19,7 @@ - telegram-desktop - wget - vlc + - nextcloud-desktop - name: Install .gitconfig template: src: "{{ role_path }}/templates/.gitconfig.j2"