Merge gitea_mariadb into gitea role

2022-12-26 07:51:52 +01:00 · 2022-12-26 07:51:52 +01:00 · 1cc9d38c5c
commit 1cc9d38c5c
parent f864a1539e
8 changed files with 32 additions and 39 deletions
--- a/roles/gitea/meta/main.yml
+++ b/roles/gitea/meta/main.yml
@ -2,5 +2,5 @@
 dependencies:
  - role: setup_fail2ban
  - role: setup_apache2
+  - role: setup_mariadb
  - role: certbot
-  - role: gitea_mariadb
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@ -5,6 +5,9 @@
 - name: Include apache2 tasks
  ansible.builtin.include_tasks: apache2.yml

+- name: Include mariadb tasks
+  ansible.builtin.include_tasks: mariadb.yml
+
 - name: Install needed packages
  become: true
  ansible.builtin.apt:
--- a/roles/gitea_mariadb/tasks/main.yml
+++ b/roles/gitea_mariadb/tasks/main.yml
--- a/roles/gitea/vars/main.yml
+++ b/roles/gitea/vars/main.yml
@ -10,3 +10,6 @@ gitea_mail_user: git
 gitea_mail_pass: "{{ vault_gitea_mail_pass }}"
 gitea_user: "{{ vault_gitea_user }}"
 gitea_pass: "{{ vault_gitea_pass }}"
+db_name: giteadb
+db_user: gitea
+db_pass: "{{ vault_db_pass }}"
--- a/roles/gitea/vars/vault.yml
+++ b/roles/gitea/vars/vault.yml
@ -1,25 +1,26 @@
 $ANSIBLE_VAULT;1.1;AES256
-65656133623466386631373466316632643433643033303030356638666362376330613333646531
-3864623765653035363334373935666338643562323130340a616538333665333638343637643735
-63353263333837313533623162383765636430356232646434346131333631316466386336336637
-6337643230613234390a326566663438363564303866626138336461633635383637643739643137
-32326165393066646264313164363261373337666563343432333933323438313739373962333462
-61383933383865343364363832396535313436663965643838333235363033366330316638313638
-64613563346563343463653736393031383966376533316332326135656562633363333061363164
-62633438623137353966323233323564336363343763363964393036343263666534613335353339
-35666563616133343935393633366461316236313139393731393466633036623032336130626632
-35346363663138646336616335616339363336643866343463393539303132623938333962393532
-32343131333833373035356130623536303832643561303165643032306362333362343538306639
-62373933636639353064303961633534373030643464663439376365316333363163633035326465
-36393632316663326539396330336234343132306437333632356163383339663266346233356535
-39633633653563643338363863663732343030393039623865333235363762353539363639393835
-62636638313734613638336336333434636630303961643463386636663934626433323638623862
-32643737303133663261626161626661613031356161613564313961366631616134643430663133
-38303831653366323632613639336162306430336637306439643738656630306664616436373737
-61363963343365336532396633373837313665306438613466333966333736386635306135373935
-32643565613831323466353234353165346433306461323064623136656234333833663234616361
-38663132636464323531303062373964623265373162363761316437653936663661373361656531
-33613132363934316231616133656631643661316130386464336531373238383632656238653461
-37303164363335356264333032363432366466653937643831373730383764323938653839353730
-36353062633730373362663732323464326661323231316132353761313835626332396637356630
-33396431633665323133
+34356466633931613332366137646437653264316536363430363166613166353066303137343563
+6462363164366334636539373833393035313039333439650a353535346464666139383537313438
+61323065656438633965366563653837643564643734333930613938623235323636353434316433
+3339316638633137370a616435353934393233343239373537633539333562316362316363323438
+63333364633239343130653035383164343039393562393334336237363133633063303534383130
+31306139666136636361656336613534663039333663323866343233316135633464653135316265
+35336138626532393462363266336162616139356661383733356137336633616236643237316465
+38303738653938353739376333383361636533316438643730633733336235613265326364653931
+36376362353738636235303338613833383332663666356432626138336633616539343464363130
+61366532623963616262653630336636663233613538313734313833313235353463616131353461
+38393832643563323366306461336463386666646632666134656133636639363431356432303833
+66363263626432363439633130643332316232646264613038393738393033363861316632616664
+30353763356137363864313964636338306137303333306636313735393537363932666637366633
+62663731353737663833356335343735363133393938636135633433343438363835613264616161
+63306632333934323034336263373261623466616264333433376535613539373437366237643433
+38626165656332383266626664306637373562363031306636366539313139323931653232613735
+32333931323664653539613064363037636130623234313730336632353934383934326632376538
+36626137626365613036376236636638666164366564363032653663393631626165383830393832
+63323864326663383864383834303163303833326562323839333337366236343935633730616164
+39336238666361303532343865643363633261326263393933336532366134653931656436626235
+66663864313937656236383835396164343132386362333334363239366232306638316162646436
+63326534623461643564653431643738623730393437643261346535613535336139346630396365
+38363133313737646633326166323638336364343764616238326333396362326462363033386233
+64313366353233643366303832393261386361383834386333373137313437303937316563336535
+65376339383734353464666233373232616366623335303962643665623764396664
--- a/roles/gitea_mariadb/meta/main.yml
+++ b/roles/gitea_mariadb/meta/main.yml
@ -1,3 +0,0 @@
---
-dependencies:
-  - role: setup_mariadb
--- a/roles/gitea_mariadb/vars/main.yml
+++ b/roles/gitea_mariadb/vars/main.yml
@ -1,4 +0,0 @@
---
-db_name: giteadb
-db_user: gitea
-db_pass: "{{ vault_db_pass }}"
--- a/roles/gitea_mariadb/vars/vault.yml
+++ b/roles/gitea_mariadb/vars/vault.yml
@ -1,7 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66653761396337623738663831343433656237613963623435323235656138306236303934376664
-3834616239633762643737373834636138626335663330330a623065336536646363373765313630
-33383935333830623432373964613531353637326463383734653562313836333636303664326331
-3234663866363336380a376336326139303834646239346533396535323366636631613364636663
-61393966343639643564303863306563613430623861353362633237343466366531343332643535
-3664316430643365363533656633633930313938343764363064