.gitlab/issue_templates/New Official Project.md

@@ -93,3 +93,4 @@ If you want to add a new official project, here are some guidelines to follow:
 1. [ ] In the GitHub description of the mirrored project, append " (read-only mirror)" so that people know it's a mirror.
 1. [ ] Disable `Packages` and `Environments` from being shown on the main page.
 1. [ ] In the website field put the full url to the repository on our GitLab.
+½. [ ] Go to https://github.com/archlinux/my-example/settings/access and remove the GitHub account `archlinux-github`

.gitlab/issue_templates/Onboarding.md

@@ -33,8 +33,7 @@ https://www.gnupg.org/gph/en/manual/x135.html
 The mailing list password can be found in misc/additional-credentials.vault.
 
 - [ ] Add new user email as per `docs/email.md`.
-- [ ] Create a new user in archweb: https://www.archlinux.org/devel/newuser/
-      This is also linked in the django admin backend at the top
+- [ ] Create a new user in [archweb](https://www.archlinux.org/devel/newuser/). Select the appropriate group membership and allowed repos (if applicable).
 - [ ] Subscribe **communication e-mail address** to internal [staff mailing list](https://lists.archlinux.org/admin/staff/members/add).
 - [ ] Give the user access to `#archlinux-staff` on Libera Chat.
 - [ ] Give the user a link to our [staff services page](https://wiki.archlinux.org/title/DeveloperWiki:Staff_Services).

README.md

@@ -124,11 +124,27 @@ Arch-audit can be used to find servers in need of updates for security issues.
 The following steps should be used to update our managed servers:
 
   * pacman -Syu
-  * manually update the kernel, since it is in IgnorePkg by default
   * sync
   * checkservices
   * reboot
 
+##### Semi-automated server updates (experimental)
+
+For updating a lot of servers in a more unattended manner, the following
+playbook can be used:
+
+    ansible-playbook playbooks/tasks/upgrade-servers.yml [-l SUBSET]
+
+It runs `pacman -Syu` on the targeted hosts in batches and then reboots them.
+If any server fails to reboot successfully, the rolling update stops and
+further batches are cancelled. To display the packages updated on each host,
+you can pass the `--diff` option to ansible-playbook.
+
+Using this update method, `.pacnew` files are left unmerged which is OK for
+most configuration files that are managed by Ansible. However, care must be
+taken with updates that require manual intervention (e.g. major PostgreSQL
+releases).
+
 ## Servers
 
 This section has been moved to [docs/servers.md](docs/servers.md).

docs/backups.md

@@ -72,6 +72,23 @@ or just a sub-directory:
 
     misc/borg.sh extract <backup_address>::<archive_name> backup/srv/gitlab
 
+## Special backups
+
+### Mariadb
+
+For Mariadb backups are made using mariabackup to `mysql_backup_dir`.Backups can are made and
+restored using the `mariabackup` tool. See also [official MariaDB docs](https://mariadb.com/kb/en/full-backup-and-restore-with-mariabackup/).
+
+### PostgreSQL
+
+For PostgreSQL backups are made using pg_dump to `postgres_backup_dir`.
+
+Restoring backups can be done with `pg_restore`. See also [official PostgreSQL docs](https://www.postgresql.org/docs/current/app-pgrestore.html).
+
+### Gitlab
+
+GitLab is backupped up using the `gitlab_backup` tool to `gitlab_backupdir`. See also [official GitLab docs](https://docs.gitlab.com/ee/raketasks/backup_restore.html).
+
 ## Adding a new server
 
 Adding a new server to be backed up goes as follows:

group_vars/all/archusers.yml

@@ -5,8 +5,6 @@ arch_groups:
   - tu
   - fellows
   - multilib
-  - archboxes-sudo
-  - docker-image-sudo
   - support-staff
 
 arch_users:
@@ -29,13 +27,20 @@ arch_users:
   alad:
     name: "Alad Wenter"
     ssh_key: alad.pub
+    hosts:
+      - mail.archlinux.org
     groups:
-      - tu
+      - support-staff
   alerque:
     name: "Caleb Maclennan"
     ssh_key: alerque.pub
     groups:
       - tu
+  alex19ep:
+    name: "Alexander Epaneshnikov"
+    ssh_key: alex19ep.pub
+    groups:
+      - tu
   allan:
     name: "Allan McRae"
     ssh_key: allan.pub
@@ -429,7 +434,6 @@ arch_users:
     ssh_key: sangy.pub
     groups:
       - tu
-      - docker-image-sudo
   schuay:
     name: "Jakob Gruber"
     ssh_key: schuay.pub
@@ -461,7 +465,6 @@ arch_users:
     shell: /bin/zsh
     groups:
       - tu
-      - archboxes-sudo
   kpcyrd:
     name: "Kpcyrd"
     ssh_key: kpcyrd.pub

group_vars/all/vault_matrix.yml

 $ANSIBLE_VAULT;1.1;AES256
-38326138666239656464333839373339383137323462363432633162643566616635633561613431
-3566313261383930333633306633363335306136666561320a306337323938623334656462316165
-63343864653637333232666563353761666533633732386637393965626232613361633733656465
-6164316636623437340a653861616236643963333334663463393265313062313964316266646364
-65616533633664336535663166613238636163393632646665383463316335326666643738663538
-62326166363838346137333262316466636462363930303837633766306334376131633539663763
-37366664373432663562643738633535316163633133623134373335383732663666633664666437
-33306363333134303361636662356561626663356439643663663264333931313637323534323065
-33396365666634363039396466656363386634616166346336623137646537363866303262306137
-63646236383337326537386637393762663934316263626138376633363838613133336362343734
-36626636313738663561643363363962666531393664656535396564663562613361656133306234
-34373562333734346330646364333534313833343739306461663432643861303762373163646562
-65613532393037333333383432343863616364633864313361363931343766646566383131313435
-65336565626562616632303332336137353032643834313065323835333531616638326539313531
-30386635376635643062333330643265636233666132326237396334346430613331663031333134
-62386538633939323637373735373265376235363032323434356636386137643931633330656566
-30613932386435323339636238383233373735376434333634343863363166623066623836373063
-32643862353632343431633962313265303262333864333133633835306664636661613537393939
-64336530633331383762313362666339363639393065326632373933623438376466643732303032
-34663339616234363763356132613731303636303064306137613561323034313164363166633738
-61633634386239373339373661313566363761626535353463386538323565666462326335333037
-65323938396362353562366231666435373562383966323836666639623332303134356665393136
-62343033333464656461326238643635626138333336363061323363396235666163623237303264
-64383437383334333466653437353466626336353539663436646230636430386634653936636433
-66363162336636393161643666633566643833316430333466653032336437316632366561363032
-65623565393530663564373937323132396539633031626134383661663066383361353138396135
-63363761366466373330303234343066393539636537323838323563323630383430393463386332
-66316263646237613939653936353636353631333138616562343737626464626430636563363566
-31316464643834386638336336303830333036633239663033636463376136613036353536633134
-35303534326466313334646434666134333964653036383536303930646538623531666265383739
-65336334373136313931393261363933376466363830373238373538356332326463626163613863
-61343861346463333465303466396463623463373232346231343630366333393833303864666633
-65353665316337313933646630663062633334613032366630333066366131623463376136633730
-62303631663236323432346466383362396361363430623766613663633432383939376165346566
-64653036653765396235633866363730646332356234386166346630653434346239616366353635
-39386337323431333637316531633439623536306333393365613335313930373064623134386233
-62623361306264323562646134656634656134633430346439356639643538623266356437323531
-30353732356632666134333433383737646563376132373638363138653939643337626661656164
-61666664316263653566663466373636356336653636356434633238373165303131383830653838
-30393037343437616538336636333262656636396430643432336366363333343938373038663764
-63663066383735383463326330396231653734626430373366613038383132333430646662343065
-61323661393264353832643035396464386437346261306462323264316433393337333639613062
-32613162306261346361356438303363346161373438313939353661363839376231656438303362
-32623130646465303234643063396236333931363462396434376432353266373666623833343532
-65616438646531383137613361313039396662303738623739366136386130396462376634653839
-39326364663430323330373661346238306465343964316637636534386636346533626235643363
-66343931633462343965613266396337316565303763646330396132383161313130363737376561
-31313935386164353137383164656532343734633566313635663561343039353537383639353934
-37303236333435626636396266663663636332646635653438356533653864303232373138646637
-65346538376264383362373236656165643463303031303131363864363664303233643332633731
-65383430343033326465376565353538363736336532633939636334363361643831653663373139
-61313137653361386237376364343962643933663532363036363534303438336364626133386330
-63323636363038646361316135383634326230386530643632313665383233656335343763353531
-65653235383866666238396135303764393566366365356537643465643562343638393466623266
-66356236616330343362353936333930343164633065643033653138643235396165396230383931
-34383035656439343339323163616435646435343734306532623032353962646438373066613731
-37616136303265373435656364386464363736616134366234643364363238356261353765366533
-35303533386431343938386535373535343933323731346637623536623861646462333435343565
-39386665373934313665653665646239333764336635393635643537323031613833366339383461
-35323530303535313437623564373131643438303831643661306334653732633563316337626335
-64393262626263356364386637646430653938633239323365626436653436393238373564393361
-64336330643061326464643237386532373633323866386662383636366137386464303465623666
-34656461336237353864613434393233323233333835316364353035363662616136643862626462
-65366131653936616333653938346331643435633933663861656462373563643761353563343537
-36653933643235343331333535653830623035393764633234626638373839343033616133313961
-62393632666138663937353137313237373563646366323634663635633262336130613035316132
-66326364393761376563323538313130363765303730663561653162326666663636313531373064
-35643264383137303131323836613136663931656631666138363035323663383439313165663437
-61323464383961343966636632656631633338613363303866643530623066366331393962326234
-35623631373432613939666630376165386230356539376666386262393362333838626336306332
-33303735616238336135313161336461323238383462633766376465623539653464306237386533
-33666334373036333533633133656430353264663533633463316131303033636562323038376533
-66633366633136633565643139656136366666373331646166396664623431373535326532343762
-36656563383461313038653638623964333434346365623665653232393237656235313362336563
-31636335303638636265363561396462333139336466303763656638663039336537393433316232
-33326466363934393461346239313365306134653839306130663564316466333765323964306433
-30346663396334653262343834623135366265633763613866383432613833613132313561333661
-32386435373039383032393266636361323536376331663132393732663030346239346366393031
-30343564646463356433393635393836646564623839333134636335633735323762656661353963
-31646537303334646231363934666535363335366463633363653364343031313136383532653763
-35663439353432373764656635353836633838663135323230646636656561386133616262373264
-30653538653064633261343835313636383332343431653633346639386436623763323131306533
-64343539376538616362633630633665613962613139373562336138343230343436666562323263
-32353832613164343131383437373139623532626165313031313933346163653365333064333834
-33336162303037376431313539656432333532396336306438363830323062383565393764316239
-62326362383366393737393537653731323965373334616330306139656437366266653836623336
-30616465346465386532643831356336303461626636636162336632623365306534626661356465
-31346461346334313666633239373561376332333436396266643962356434383535626461366437
-62326230373635393836333530393936646137393863623437306333353630343464386663623733
-32663433323137653133346265303133323166326564373939363539633337643139313534623131
-61613635363331303666316630316537626435613061386563666261396461646661326265376530
-66623938363936396538393731393736616234313666636231373262643633323133346638303737
-63396564616466663561643632613833643434363863313964626365336533613661656364616261
-64303331346662343862333361336363343534343032386435313865646636653734636364323738
-62396166623931633262613163656539353536623665363164646434383733333638616563636238
-32306337323061616661323463616264363633396432346635633835643830353736666639393161
-66313662336334396539393266653264613739653163356434393738333236343430303339313739
-63633566353739623031373835653135653363663865363536313164326233333065376630663133
-33393162346335653034643361383538313831303261383437633630316535616638656130616262
-32336462303639333334323936323730366132666666643263643338323339636132393564663538
-39376530656162636134653837393436356237666634666664656538343339323634383265336165
-62383434383864313261643964623061396566663333346332326432636133326132366666646638
-37383565636463313663303837666163653665383532323639623536623033633639646266663132
-66626636396632653038663662303936633835336133643964346533343038376564353430303965
-66613532313132323264633462316538306465366138633466663938323231616564656337646366
-31353837306130666436346136646134313562656130386661383539333261356161626664613339
-37313434626366626665303234313735393934346261356433343930313264373431633734336539
-32396535393235393262663938313339363366646532613064303038643938333230386161396133
-36306130326136643030616334613936656261353764343732636161326561613363353166343466
-37316533323463663063306530616338353666626630643565343535303338346465313931363530
-36623562326562303734356634303832393634663038363862366262613937643130373361663662
-61333933386531646139306230373238326361336230383164656134363665363739643235353836
-33663366393831313234303365313834353438653862366536383461633634663234356238303864
-30346562343365303566323564373064373136383866626635353964353961333631373661383535
-30323732313731343666623233303232336633663262386432316530386331633337373632613363
-37616530326135353762666633636335633663666461643561313539346439336532383735306638
-33636232396564616364656363643734643333666365626337333738383530376438636235383939
-36646462653835643638343439326532343163333337343263376536383733356334616438393335
-64356534346465356363323335623435316366326539343234326439393762623635323330373663
-35323232613631313832663234343534373331623034323966366265626235643363383535383537
-34323035653931353566326262636134323461333537376464653735313961643064346338633132
-66646465623761343065386138633237383036396665623961643738383766316363646438633137
-64336164663837326362373466373132633166393132366137306664633035653833373366633761
-34323636383137663363653033623036323039636438636466373532396634663234326233363461
-38383463316430356434646162326530366566326266633862663434613732333439633735386636
-36396464313861393665356464356434303735613539653634643936653839323239386162326331
-32376161353934633134393034306230353330393430653538343830626338633932656562323861
-63633435633336396239613430376463313136616363646363343936666331666364386466336633
-62303136303036343039386166316166376437306339393539623532666534643034346336653038
-33353837336661653939373638626563333865343964376662663464633938653061646239633561
-36623139373133393762383333636666613237326263356261336533386238356363663761623062
-36333462666434373666656231363530666265376662653736383061613461323065363037323937
-38653961663362303131363664646631633933363966373236386536633337323562343433373830
-30653264303665303632613431393066656630363264383035363938336466376537313066353639
-36663138666134303963303433393361343336353839373432323165383563343563373333383738
-62623431336431633931316435353763323833323635663937616330376462316663353833353530
-66346332663335303262646234323561306238383863326532303231356531633765303666353838
-66336166356266326263363030653161343861656638303538346439313337623866626566623438
-63333936363564313163633965353431303531383630366230393262346338623336656537666134
-63633936643532613634653533336432633762613666306435333364636265656239323361373463
-37303138336166353536633565363233643032303734323535663234393535636336306532623863
-39343461333933656438313633316466396461396661656432396362396161633430376238623433
-31643965666234613264363430316635353237373366386133613366343737643965636234306332
-35373436346233623235666230356464383365356166383639363330316238373764316139363933
-63376266613764306630623534333463653735653637323037653739346463343232626530656561
-65646132313934616565303466373236616538663562333063353864633636356630363230303032
-31316232336537643230663666623731613839336436643936356139323534313165306537636161
-36393137333362346233363265633066393937636230326238346665373231303262396231363738
-31393162373734326562643639396263363466393037386431303630303762616566326365636535
-34363263636535666463356364376263623263303337626534306461373864346461623235336466
-38643337353630653137333536376166363262376439616462633866343131656634373862633532
-34656435316138643237363433626338356233393239626332633635366533613336343837373430
-37373265666439326338626134363032373463343436393462323634396330653962303733393832
-65656361343234343164336464646432386431306133313361353662616166333061363461303463
-30613563376665653431313062613835383065363265623035383766313861313132303162343430
-64343234356366656634616231356239346536346438656235656432613066393935303664346232
-38313434656262316131346133373761376664303361343233363965393565613438306230626136
-34336237653635323232623464303232346330316261663839356331643562383662316639373536
-66323136333837363136306530383962353965373564383965623133316539376432636666396636
-38363533393463626264366361323264616663643266666166313938323137343237303237393334
-66326538656465366462663432376339636334376331396439666166313439613531616439613936
-30626135396136666430356562353937363334613930346134346665626136333033663436666537
-64636235313331623036613039383633623361376435636633646231366162626361356561643839
-63653365313637643961623766643130356163653438613137656633323763333630653262303464
-64306264303534363932383166353731663730313636316339343463373531303433303731383631
-66316562633131386137386535373332373764386635613137313565663064303933663631633036
-63666534396665376262363031333463663065626635373039313961633562383333343232663263
-31323639353363663631376336643166616163383261393266643166633732303830303230613864
-39306265636238343539383764393063333162386634393564336266383765333733323534363434
-32363262346632656137333162386135646436646164343730386463343936623439363166623462
-61393366643239613763383164356563333935396638316338383232323931393165353864626463
-31376466313133623537373233623238396138626332343439616531616131336436633334353731
-63653438616230653563343536336434396234643534313035616536626233636534336365366165
-33343637383538343334663034353834316330366338363833613564646463666262616632346134
-38396333323834613562313536636361393436346436396139626439376533303165366165623036
-31386363646633363634366634303734333636363265396165316636386337616464623137643865
-66356436316232343961343431663034356636383533613564656132323037653465303361303734
-65356262303239316535363266643634323566366233396234386235373738663463636134623838
-64366565666430663438366334336330366638323534643366356134643066636435353964616436
-61393038343030666664356236656437656436363438633239313731663766623834316665393964
-62633462313462386264306562346538336561393634343034636631663834343764613164653438
-63636232656333623937313037313537313166336566626633326233303565636462363839343366
-62363330616635663933316563386661613365306134336234343264623437646365653135623264
-31666664343361653763643836623833323438326136393937633530393930643039343433633333
-35316638633866643966393232636433653834643165306132653332353961323834373836356635
-32633839366635613533336264636562666262333130666461356234346162313039396666626666
-37643765363230613434643861386534623261623635666337353736303364373930303335313333
-66363839333633613661656438633164363631646562306530623765653164643238646137383031
-63353964396466383135643466353865343134393339636430663561316639666233323566663062
-36393139636337623233616331323331383062636463333838373231303836383662393933313635
-34346537323236336631363562396339386234343166333131663933383431353338373730653937
-64346238623639366563353761623364313632346336373730326637343539626661383633656431
-31623965353439653730303838633430313934353036333234343564656434333134646362333864
-3133626361313538376564343730616137303036663566623662
+32303037383861306435323935613563623037323637393138353764313937633138333334623863
+3039386338373864353137343637633864646464303661380a376238383938323563333135323538
+66646531643738653932613766636339393734303134333836356139333839326665653636306335
+6637306335643438630a643530383633383133336363626163393436326637376564613132393435
+63373866346165373966653236313431363639616532346537343861316161613365383163366430
+36383131333965623336343865353962386463333466313433396438346632303039663131313138
+61623430356536373636363435396264616233616131373034356364616430343564393564343362
+30613665313939623136646162343033326433613735316361613935663564353661616161633836
+36323633633762376563663732666137633337346162343831393135663336663933663462346433
+32303564656135356262646234623761663434643662336365623037306363616335666533376532
+30353230663734326461313064383235316235356166303137333463613564336664613438626661
+31313038633765326235396233373665316465386436363530353735646366613834343337306135
+61376430373431373234316361383164373632653738663836393065656238626431643533336165
+64373834643037633162633439386333333630363835396336656332376361613932663432313539
+64303965643236336539386663336630643663663639373731373431386463626539393035303664
+35623932333137323031383664323538663764323435313836666264613731343363356563326139
+63333131393862613932336462633337373334326237346136613037633037336561393438323432
+38376534633534663532386332373066663561366363303633376231363463333062323636663862
+66613131626636613162656432393665303830663963616139363437376636363538343135343137
+31643163623331613965623737646538306534393533623437613162646665616232613965393766
+34396165313833613439346338656632663566646465373433343932396465343462633334333430
+64643539386134323930656430303962653536643537636265313932633230306163366330636337
+38343438313833336261623736613239356164303534396332343864393439313461336239373435
+33333762623430383065373232326332643266383439636331373233633264336438336535396436
+61336165663237656433396439663035343631386535333239326565653935613961366231346130
+30656333313766303162623961646336366461306538306465643337623530336332613537366335
+39363966623465613134383536633662666661333666393161386434333032383362626665353563
+63613564373431626633666631626332373433633564636335643835356537316263313333656332
+38316663643632616130336462646362623637306466343937343731333431353662383539653136
+63336665323866353532303861623837376633663234656435666238363465313962623161323666
+33633331333661326665326537326134333939366662343837653661653834373562303365306330
+31346538393737363162616239386366336564383934366563346364663466383237323638623466
+34383530383464663830323831636336303166666366333664643133626633626434613063373938
+32646237393134663335343030653736373933306535376265386461616535333532326339393737
+63383135653531326338323238636631666432313139323966646239666231303139386366613335
+30313130303465643063383034326466643532626335356362343566326564306661323436343831
+33626338646666626632333464306464353537323062633731313166376631306637666336623261
+62313830663635336439353730666637333634656164366566333638653762626462366636613038
+62343832336539366264613036616565616365383031373662326233373262313334333536613832
+35623037306339623031613030323166326339363135633638393839316536623362363235613065
+63383130666665323735616166306362383633386536356361356461656565613565313734653635
+39373838616235633335326361326634303739396231613937323862623934363239636639383163
+35383538353136613131336363616632393465393032653032343263383462383437363861386638
+65336439623432663636633631633266346636333833353833386163383262663738636535323536
+37373833396163373864336666616361323738343535343161663534346264336235356565316636
+66643438333433346466373836613438653337303863316564656335363361643039616536373462
+34393437353834323937636163666635626362313131393235646637613466363139633839633362
+36303039303266653338373939646135626338346665633530323136363532356464393337393730
+66346465623633393664386661396636653163653464643137323935356132336266343638356133
+38336363336335393937613366326439343131326530643130336535333938636166386461656165
+38333435646261623539666462343864356236636661386431356365356233346238613766643639
+30336536343636613130373232366463616266353238376333336331623036386434633832643839
+65353537373161623833636162353165626462663135653864636161656265383237363833316239
+36316338346563633532343862663861666164653331323133396666626464353865326466356264
+38633065333137326533306432303137396236373766643264383235633235306563393130663961
+32383435626332343830633763343263336138643734343264396535383237376233373261633436
+39613139313738356138366336393231633031386362643562396631346132636239366363656430
+34336635333830366234363938396661303636633834633165616466363139356530366637336230
+64663536343631653236313037386666303331346432396364323465653431323966653031313633
+31393161366236376332623361313232626532613639386630316437343830393332383861343932
+30396562363730613432346561636566646163616138336330306238616235316337613763373365
+61333164653839323662366632323965346661366339623436646463633063336135646231376434
+35643063386532326330396331303838663365353465646339343336663462313165396132343035
+33643336326465633230663865663164623734333363646630666437666266336232323239316664
+64633863623564366631306263653061616436373335303538376166656632646134366432633964
+61646566663239336562363566336364633134316331323065636633373335663935333639633838
+35643536326533616231646335336463373965333239363132393165643530343366336466646631
+33616331633930663239343166613339633534356536373136353962396330356263623765643134
+64346138353133623437316335353434653332643564306536303930366134636133343539323465
+62376635623563373663396231623163353734323039613465633863303062353735326265343839
+65336363303161663338646637393038366566333937656264373066353736666335353865353165
+37363765373830316335393864633231663434646564653864623337386639313735316435396462
+62393038313533393537353838363232626539386431306366333763343536613931306432633936
+65633762373863613032613664306338613631343866323761373661386361626337346164383735
+39316230353336373665386132646465656266623631643761653666336666383335313132643635
+34353063326130386334386164376634383765653162336133663965306538303733376431323266
+35336131633535306133666331323066326162373166323937376266323461396138323031396462
+64666461333036353561393934616166313030623236643663623061386539333262376639616236
+35353835666230383231626462666164323433656664343732393566636664666662316239323338
+38616533346163623230336433623837376433616531303134616537643130326636626264643132
+31616365396437626265656135366532326634303037653232616366316234656230326135666133
+36333463366630373863666432396462373131333130366233383233303733373738323232316661
+30646333316135373833613838623861636139383863306261353738653061356538623235616663
+33633239336231663361636466373438343963393966313936326536363432333166373063376335
+36333264373236376266343335656532666330373466386434336439393830656537393463656133
+61636434306366363861633466626439316365343437313163613962326666336232346132663436
+31323863646665363832393535353833346364653461383333353938336436666232303932306365
+35373030336534336630363263636538346339643632633231653163393262643766356539376465
+61323630353830393539313633323731376538383839613761633561363436393061663739323737
+62653365393235363238666665333039393433383461653863653635613162633531363133633366
+38653238383835623563333035353565343838343139373732663165303732373337613438343662
+36633531383438326239623637366430623863616639346532393266353530616332653438313961
+37353938656631393736666237383839303633643731646164323265353265656363396361316632
+33303333373566356562656264623137376338333066316132363566386135393361623361306162
+36376439373430646661633036313731663566393137323062306461363661323334326565623237
+32623332393263353132383533383037666534323138633966333138343037326666373564633166
+61623662653064323866633030373538653164383831653365306638363837326435393764343236
+39386665383462343665336331656361656234353130353361386234386334303230653537623132
+35636339393436656362636266386166653462393365376465613061663834613065663235616230
+66633638383934386332323239353034376336366635326338303463386139616566386261306266
+66633265643736646131646435396637636337333066393338663136643736653765386163333434
+30646533623638396462376230316663636636633565353966623235383463323262363937323239
+63313931656639643233333838663233306335656537313433386335313531356339336461663137
+66626230393937333461636336653839383166306236656237313235323530656564346235303765
+63333663333663363061653237363564303238356261623331663730616163386563616433353164
+31636639343165303830303062613239366134343635653364316662646439663332346330346465
+33646461363366343831613235626165663232633862656231313732653134353237333038383063
+63303330613837633963643037396530633966663362613534373937626232636139646231396239
+34333334643361313932323335363764353866636334383562633436663861653066336430623264
+37316530653937616630343330656234656335373963323331356362363835636138393562336632
+65336161373834376664353066666663393034623634346165343462366430333030663462396231
+64633365336536313432363939373730303861616639383539616239616365346531356434353963
+65343131663833613038396339356331616531333465623563316263633866323138386330643433
+30623539623062343030356435313732333132313234326166376539613461363666353032386631
+37353635393265363034386136393537653131633437343531336330333762303738666536633832
+66653237303533353739633862346632613938336636623865383437313735323733653739343332
+64666163363338346566653238643233613065356531663132616439653930323066353233386162
+36373634386264313164373561636330333433373936626133626564633933313131646339393835
+63653332656539333661636436636130313435393934653130666333383361393263306565613338
+32326665336265313933323132363137333330396434623861346165636161333864623230353132
+38333833336239663831396134653136616232353965383630303032626230343639386430333164
+32646230643966623065383763353232626630656561353564326630336330356235643334303431
+36303534633661613265313335393738653631616135316332663630346566363764393835383338
+61646332643231643733623138373734613764636537313061303034386636663363336431383437
+63373939636539386262346233376165396132343535383630363866316334646132656163633339
+66326132613162306334653035373336373431336436366639623635636161656533383630383038
+33616564336364313966313761613433366362656265333736313432646566343761633332333034
+35323864623566396466353335356331336633646561646335336466353833633562306335666135
+34653763633231336530333965656431663332656636336266356631633764623232333766303132
+65323739366431653835343731303163613561353331663936386131313265376434306335346439
+31396163393834326430633066393239333439393738353339383436313636306538303335363562
+65336262306266636264346337343630366133376532626137616335303133306134313233633932
+33666535323938643461393535343034393233383863623338653063333934636638336337616330
+63343836363733633863653833663561346264353834646562613230646338636334343666366664
+35623837303930323232646263643664383936313462386431366235633237353933353138616138
+36623732626232303836363537353836393261323539643464363734656165333632623563663738
+37613631653532656563323266353034303035306237313935633636643432653738396132633763
+31353136633233633630666234303135396237633536666665303463333666333533623730643537
+61643638393033376434346566326334313431343839393734656264663661343134396265393638
+33363865336566616333633930643539616334373937633665326639343137383265613430326634
+30396235303464663931323762663665316131306664303334636464376465356563623232313230
+63376538616239303764656634303930316566396234313039346134663433666538643037333638
+32616562383366656533363237313265386339646130333933373364316262626638343663303838
+38656534663233646161666266316335303235333931373036353634303535356330313535656231
+38366239373761343135323561636361303637326461363930353466373439343134353862643232
+35393966303961316337613865626132626130373639306139616637386432343231633766353337
+65336364626462333761323232386330386232353436326630613639363834376266343238376539
+36623532366335323263646636363030613533323232396136386335623138313166363963663564
+36356466353662336534396433376166396435306632666164663538353962613334373032393437
+65336330653662323837636635326632326665366630386435633637346530306233306561623332
+31646537333739343863343662376637383735373538656331333362363034646438346466333961
+30343838326337373061366538313536636562373235623833383163656263323565373430336161
+32313836343035663131626230363361633630376130636538363034363635303234313964643036
+61636666653835313963623562373365396536333061316361633761313132623338613836353130
+33376231666165343163663337636266653638326134316433343435663366326539303861376165
+30346539633935623366393231663663336261316162373164383434663066626465326533306636
+34643636316665656562316632643766356331613735653338363934303161336238666166323331
+61343039373066326661376233366433636231316264346132666232643564333032333738396464
+66643564373230613533323164376236353766343535643237323563393765363536323961333637
+36303361666334656362643332393764616431636265346131373937353261373131663066626233
+38373763616638616337616462373233323330346130326661343639333361336639386436393565
+65623734393964656535646534663937613662363530343037633862613032626231376439306562
+34396236323161313635326665643932316531343734663932343738636364343862373566313631
+37656534626333646434383838313635313663343036343666346461343363383232333333383338
+35636535653430313930623563363730666437346164623639343663666565376538383461326533
+65616136393633643335373838356439323532636437626231656161333739303237313166383139
+36373933346261313566636234323235383464313635383136656337663132353861633261393562
+64323931666431633231393466356463383335306636636238656561633866316634643639373062
+30316231663135643466326432386332383031663838623431313437623539353430663333653636
+64636632656339323733336462316430626536326539623566626232333337643863386436366434
+30333839656462653337373862313630313834353632646238646436666333393833376131313434
+64306334356261326639346163363232323661333564356535633731316437393536346636386363
+66306530376434346662353665393835663534663966613761643130396134353362633765623761
+39616336663836653639633733373937653064306231383232633631326561643536313266643432
+62393535653966623864373535313065653435383565666236326537353132386664393631643838
+31363762633231326534343365373538333266353532366438643734323363333261633738333530
+31646338613766373663623361373932663730643136333833363035323335623636643766646635
+62613538666265306532623733653837356665393733396564623762643437306564306635306132
+61623937323061363432643435323165323433356433633339326130383062313661386236326630
+38626630663633303135323638656635356635333739626363353661393961643762613464326330
+34386631616366316134373933386233656439653236306563323862653731633934643835633861
+34373162366563386264666435616262633330633966313961376338376331376361346339663166
+38376532613736386566646264626537323630326661616337616630316662313339306565653735
+61373132363730323430343262656539313733363464633735613661346330326431353431626463
+35303764363630373638303238656135373865313862363638363230636663653231623862626132
+61666533346439633962356330376630363334373230663461363638666263616262366130643738
+66663561656362323564333432633566666464376638626139333134353131653364376539656236
+30646562366633306566326366636334303236326139333035396236613231643533646464303562
+38626537336362623339383232326137373465346633663463643466336535313664613037333232
+31663063313962353964636430666136373334386636343263393761353231323363643362633530
+62363466646632643333343936653831343030653065666534383032623036323436326266663031
+33313139376665303037623737343964646262393938376563353965646164383337343635303432
+62396537323136653536373139616466313363613933353565383664336266353965376665366135
+38376363363132626566363134616137666165306632303632366434373533353636653137306532
+37656263386536633435623861333537376637303332646461396465386362623933643131653561
+66326133653236626132643838356639613737313833386437393934376436386465303539393532
+63646562623665363933616338376138333633323137323064396339613631663066636432373930
+61356563363465336437663534363561636331656337656466366136353636393034313762333338
+64653536396330353662333661353066633263343335616431376433303861393231636532313031
+64313136386634653332636531363766613263316632666233633333376432346564383037363965
+36316430323266356634363366636565373136356632623166373763353834666262653363616234
+6432653264303834626534386532636331353861346661363061

group_vars/hcloud.yml

 ---
 enable_zram_swap: true
+configure_network: true
 dhcp: true

group_vars/mirrors.yml

 ---
-archweb_db_host: 'archlinux.org'
+archweb_db_host: "{{ hostvars['archlinux.org']['wireguard_address'] }}"
 
 # raise tcp window limits to 32MiB
 tcp_rmem: "10240 87380 33554432"

host_vars/america.mirror.pkgbuild.com/misc

 hostname: "america.mirror.pkgbuild.com"
 archive_domain: "america.archive.pkgbuild.com"
 mirror_domain: "america.mirror.pkgbuild.com"
+archweb_mirrorcheck_locations: [14, 15]
 ipv4_address: "143.244.34.62"
 ipv4_netmask: "/25"
 ipv4_gateway: "143.244.34.126"

host_vars/asia.mirror.pkgbuild.com/misc

 hostname: "asia.mirror.pkgbuild.com"
 archive_domain: "asia.archive.pkgbuild.com"
 mirror_domain: "asia.mirror.pkgbuild.com"
+archweb_mirrorcheck_locations: [16, 17]
 ipv4_address: "84.17.57.98"
 ipv4_netmask: "/24"
 ipv4_gateway: "84.17.57.110"

host_vars/europe.mirror.pkgbuild.com/misc

 hostname: "europe.mirror.pkgbuild.com"
 archive_domain: "europe.archive.pkgbuild.com"
 mirror_domain: "europe.mirror.pkgbuild.com"
+archweb_mirrorcheck_locations: [18, 19]
 ipv4_address: "89.187.191.12"
 ipv4_netmask: "/26"
 ipv4_gateway: "89.187.191.62"

host_vars/matrix.archlinux.org/misc

 ---
 filesystem: btrfs
+static_dns: true
 wireguard_address: 10.0.0.15
 wireguard_public_key: QWkTL58mJd0+Lz5AvGVmbdSSk29y/W60WUdhTgyGLCk=

host_vars/mirror.pkgbuild.com/misc

 ---
 mirror_domain: mirror.pkgbuild.com
-archweb_mirrorcheck_locations: [12, 13]
+archweb_mirrorcheck_locations: [20, 21]
 filesystem: btrfs
 
 ipv4_address: "78.46.209.220"

misc/borg.sh

@@ -4,14 +4,15 @@ set -eu
 shopt -s extglob
 
 OFFSITE_HOST=ch-s012.rsync.net
+ROOT_DIR=$(dirname "${0}")/..
 
-decrypted_gpg=$(mktemp)
-trap "rm \"${decrypted_gpg}\"" EXIT
+decrypted_gpg=$(mktemp arch-infrastructure-borg-XXXXXXXXX)
+trap "rm -f \"${decrypted_gpg}\"" EXIT
 [[ "$*" =~ $OFFSITE_HOST ]] && is_offsite=true || is_offsite=false
 
 # Find matching key
 matching_key=""
-for gpgkey in borg-keys/!(*-offsite.gpg); do
+for gpgkey in "$ROOT_DIR"/borg-keys/!(*-offsite.gpg); do
     key=$(basename "$gpgkey" .gpg)
     if [[ "$*" =~ $key ]]; then
         matching_key="$key"
@@ -25,7 +26,7 @@ if [[ -z "$matching_key" ]]; then
     echo "No matching keyfile found for this host"
     exit 1
 fi
-gpg --batch --yes --decrypt -aq --output "$decrypted_gpg" borg-keys/"$matching_key.gpg"
+gpg --batch --yes --decrypt -aq --output "$decrypted_gpg" "$ROOT_DIR/borg-keys/$matching_key.gpg"
 
 BORG_KEY_FILE="$decrypted_gpg" borg "$@"
 

playbooks/accounts.archlinux.org.yml

@@ -5,7 +5,6 @@
   remote_user: root
   roles:
     - { role: common }
-    - { role: tools }
     - { role: firewalld }
     - { role: wireguard }
     - { role: sshd }

playbooks/all-hosts-basic.yml

@@ -5,7 +5,6 @@
   remote_user: root
   roles:
     - { role: common }
-    - { role: tools }
     - { role: firewalld }
     - { role: wireguard }
     # reconfiguring sshd may break the AUR on luna (unchecked)

playbooks/archive-mirrors.yml

@@ -4,7 +4,6 @@
   remote_user: root
   roles:
     - { role: common }
-    - { role: tools }
     - { role: firewalld }
     - { role: wireguard }
     - { role: hardening }

playbooks/archlinux.org.yml

@@ -3,17 +3,11 @@
 - name: "prepare postgres ssl hosts list"
   hosts: archlinux.org
   tasks:
-    - name: assign ipv4 addresses to fact postgres_ssl_hosts4
-      set_fact: postgres_ssl_hosts4="{{ [gemini4] + detected_ips }}"
+    - name: assign ipv4 addresses to fact postgres_hosts4
+      set_fact: postgres_hosts4="{{ [gemini4] + detected_ips }}"
       vars:
-        gemini4: "{{ hostvars['gemini.archlinux.org']['ipv4_address'] }}/32"
-        detected_ips: "{{ groups['mirrors'] | map('extract', hostvars, ['ipv4_address']) | select() | map('regex_replace', '^(.+)$', '\\1/32') | list }}"
-      tags: ["postgres", "firewall"]
-    - name: assign ipv6 addresses to fact postgres_ssl_hosts6
-      set_fact: postgres_ssl_hosts6="{{ [gemini6] + detected_ips }}"
-      vars:
-        gemini6: "{{ hostvars['gemini.archlinux.org']['ipv6_address'] }}/128"
-        detected_ips: "{{ groups['mirrors'] | map('extract', hostvars, ['ipv6_address']) | select() | map('regex_replace', '^(.+)$', '\\1/128') | list }}"
+        gemini4: "{{ hostvars['gemini.archlinux.org']['wireguard_address'] }}/32"
+        detected_ips: "{{ groups['mirrors'] | map('extract', hostvars, ['wireguard_address']) | select() | map('regex_replace', '^(.+)$', '\\1/32') | list }}"
       tags: ["postgres", "firewall"]
 
 - name: setup archlinux.org
@@ -21,7 +15,6 @@
   remote_user: root
   roles:
     - { role: common }
-    - { role: tools }
     - { role: sshd }
     - { role: root_ssh }
     - { role: borg_client, tags: ["borg"] }
@@ -29,8 +22,8 @@
     - { role: nginx }
     - { role: postfix_null }
     - role: postgres
-      postgres_listen_addresses: "*"
-      postgres_ssl: 'on'
+      postgres_listen_addresses: "localhost, {{ wireguard_address }}"
+      postgres_firewalld_zone: wireguard
     - { role: sudo }
     - { role: uwsgi }
     - { role: memcached }

playbooks/aur-dev.archlinux.org.yml

@@ -5,12 +5,11 @@
   remote_user: root
   roles:
     - { role: common }
-    - { role: tools }
     - { role: sshd, sshd_enable_includes: true }
     - { role: root_ssh }
     - { role: certbot }
     - { role: nginx }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+    - { role: mariadb }
     - { role: sudo }
     - { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
     - { role: memcached }

playbooks/aur.archlinux.org.yml

@@ -5,14 +5,13 @@
   remote_user: root
   roles:
     - { role: common }
-    - { role: tools }
     - { role: sshd, sshd_enable_includes: true }
     - { role: root_ssh }
     - { role: prometheus_exporters }
     - { role: promtail }
     - { role: certbot }
     - { role: nginx }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true, mariadb_innodb_buffer_pool_size: '1G' }
+    - { role: mariadb, mariadb_innodb_buffer_pool_size: '1G' }
     - { role: sudo }
     - { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
     - { role: memcached }