diff --git a/ansible/roles/forgejo/files/app.ini b/ansible/roles/forgejo/files/app.ini index e4f7d89..17a25ec 100644 --- a/ansible/roles/forgejo/files/app.ini +++ b/ansible/roles/forgejo/files/app.ini @@ -122,19 +122,6 @@ USER = "{{ vault_mailer_user }}" PASSWD = "{{ vault_mailer_password }}" PROTOCOL = smtps -[packages] -STORAGE_TYPE = backblaze - -[storage.backblaze] -STORAGE_TYPE = minio -MINIO_ENDPOINT = s3.eu-central-003.backblazeb2.com -MINIO_ACCESS_KEY_ID = {{ vault_backblaze_access_key_id }} -MINIO_SECRET_ACCESS_KEY = {{ vault_backblaze_secret_access_key }} -MINIO_BUCKET = 0rng-gitea -MINIO_LOCATION = eu-central-003 -SERVE_DIRECT = true -MINIO_USE_SSL = true - [storage.repo-archive] PATH = /mnt/repo-archive diff --git a/ansible/roles/forgejo/vars/vault.yml b/ansible/roles/forgejo/vars/vault.yml index 746c236..e2cfd42 100644 --- a/ansible/roles/forgejo/vars/vault.yml +++ b/ansible/roles/forgejo/vars/vault.yml @@ -1,37 +1,30 @@ $ANSIBLE_VAULT;1.1;AES256 -30666464303435376330366632383932623337346330633435353264643164613637376233646466 -3237326337376539396332363161343336393466303439300a343035613837633263353834653764 -64633835653035643436653237613766623265643062313431393938393565323065323035616338 -6663333066663233640a326136333131346565393064303430313033356134303839383338363962 -63356362373035623763616235336165656636383863366632393032303339653161363362373461 -38393536343035633834386337343865356539653937336238656166326339656334656666636532 -32626364326161646565353464393161663134373532386566643539376236333866333039366339 -33363138306465396633323438316239636439666232316333656437343733373037353230613663 -61316232323435646530383439396463383962333732366339386665393265353533336234366534 -64333132663861363432313062663762383939306136633233313438313337326132343437643736 -63376631626533356537393566626164646533313337373965653666316165323362363961383837 -65396633366430373265623438623432353430623666363861336230343861623631643937623135 -30313231623034316262633630656231393838326332393638353231313464376531656638613336 -63356561373030656266383439663835373032316633633234326239366334343738636162373135 -65386665396237343533373135653634313231343634343631373263633430633839636132633930 -66373730653162343562316636616665376438663539396634663166303163323631623936356530 -65396231323639646339353236323465613764333863646633623833666161303265383434353066 -37623462333437343334653736663139313539366563353566356162356239393734303132333734 -37396535376261346532323664353264313738343936353737386335633638636231666538663363 -36626337366163663266336439303330613336366133373938656530343064616535363337633265 -30616464666536663335386263373565363535303434623964626431633465646334623065343735 -34633666326630376639626536616635316636393839636665646262623535383634343866383865 -64623032373237666265376265303731346139336231356166363366363133666635373961373263 -37666363396361653431646635383063333261343337363934656561316365333665303935346639 -65333131393561393961323061653462353363373033373866663032393464616632346238356561 -64633465376632373263386161323731646538656635633637386237376166333866613232383338 -62303935633962343038623336386530313465626435613165653064376535633437373665323266 -34666566376238313861613036313630363735613832326466613565386339616237396331656437 -31393238613433616230663934303933303337663764326630636232636231376565363334623432 -32363864643633653835626338366633373035363038323032653930626531636661306662613831 -61613239316365666437343436636164636364363330356163383862643337326634633236323137 -34636662323061363635623338633139656465616239303664336336393236386433626537653633 -38333761383830363936656533626262626233316663313936346334643664353434353833663238 -38396439326130653138633939393262366231663232653762363263643734613736383837333938 -31383330356565643830643033303139666161326165346164326538313462613764346330333439 -65643464396163316337 +33656238613630653039363133393334373930343862376564373765336532393039313465643032 +3064653630663632633337613631363136376534353737620a636233383034363635353431363938 +31323461656230363737343433643366313962623435616162373763333161643837393864663630 +3931613934623938640a303534666632633335643836623935633366633032373138356133643534 +39363535346634636231313831333065306135616134393764356561626564326364336232643834 +35393437333039333764376262636137316336353836613663643066303634616637303661366438 +64353165393066366635393137303436336131363335646364616632363961343963383936353261 +38393666303461643339613332633762633364393430363134613238373661303139336334653534 +32313531373965326562393763646461633965336634356166393234306639356263303239643566 +36643065646334623462616461366233336132386632656661633131656566626565363763653833 +64353939613739653263306131653861616333363664663863366162623162373337356364656539 +33333066356365303832393036356537313430643534663732393062646436643662353839393666 +65313132386533343261343365353234316164313637363066323036663831343235633937306666 +39643061636561366463316664646134393163626637343230613736666563326138643430396132 +31343231656461633466633565346433656436663433396566363835623033383965326138616362 +36396535633463636536633534646161633433306133303133386236623064633938373831613366 +64653766326662633538646133386237346661613334646232616364313533653238336238306339 +31383065636564666665373863626232643938656565653538646330643866646337373465653139 +35363334333932333635346131653234633331663964356234393435303532313665333361353163 +36666264333765336264626539306334616466666239613462353239623662303661613166373130 +38363537616162333736396164653166346431623561656534396661353735393562346433396536 +33376437656136633063626364306632333363613232633834633562363132313738623033623430 +33393761303332656238633835366637343932356661313137356566643935363231326138326535 +34323663616363636632363364643339616565306432613666653832356134656130363236636265 +32366635633062653533616234666437306230366664333037373535393634323735336165336532 +31613138346538306235643038643839366135316534656336626265316364333039623635663933 +32376235636365646136396534393937653862643266653663623233393362373232316131303237 +66393731323163633536626163346164343164376664623738633162346133373137646664383362 +39313565613863356361653864643937373530633630303836396462653537376339 diff --git a/terraform/backblaze.tf b/terraform/backblaze.tf index 026c3aa..e68e47a 100644 --- a/terraform/backblaze.tf +++ b/terraform/backblaze.tf @@ -1,37 +1,3 @@ -resource "b2_bucket" "gitea" { - bucket_name = "0rng-gitea" - bucket_type = "allPrivate" - - default_server_side_encryption { - algorithm = "AES256" - mode = "SSE-B2" - } - - lifecycle_rules { - file_name_prefix = "" - days_from_hiding_to_deleting = 1 - days_from_uploading_to_hiding = 0 - } -} - -resource "b2_application_key" "gitea" { - key_name = "gitea" - bucket_id = b2_bucket.gitea.id - capabilities = [ - "readFiles", - "deleteFiles", - "listBuckets", - "listFiles", - "readBucketEncryption", - "readBucketReplications", - "readBuckets", - "shareFiles", - "writeBucketEncryption", - "writeBucketReplications", - "writeFiles", - ] -} - resource "b2_bucket" "restic" { bucket_name = "0rng-restic" bucket_type = "allPrivate"