From fe5bdab25306d25b89ac08c9c534a92af84b274e Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Fri, 19 Jun 2020 23:39:58 +0200 Subject: [PATCH] drone: move onto gitea server and adjust for gitea --- group_vars/all/vars.yml | 3 + group_vars/all/vault.yml | 103 ++++++++++++++++++--------------- hosts | 1 - roles/drone/handlers/main.yml | 6 +- roles/drone/templates/drone.j2 | 5 +- site.yml | 8 +-- 6 files changed, 67 insertions(+), 59 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index c769018..dbc714f 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -14,11 +14,14 @@ dns_axfr_ips: dhcp_omapi_key: "{{ vault_dhcp_omapi_key }}" +drone_admin: moepman drone_domain: drone.binary-kitchen.de drone_dbname: drone drone_dbuser: drone drone_dbpass: "{{ vault_drone_dbpass }}" drone_secret: "{{ vault_drone_secret }}" +drone_gitea_client: "{{ vault_drone_gitea_client }}" +drone_gitea_secret: "{{ vault_drone_gitea_secret }}" dss_domain: dss.binary-kitchen.de dss_secret: "{{ vault_dss_secret }}" diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml index bb6cec4..aac4d1d 100644 --- a/group_vars/all/vault.yml +++ b/group_vars/all/vault.yml @@ -1,49 +1,56 @@ $ANSIBLE_VAULT;1.1;AES256 -61616165323233313361366635333363646636653837656664383166313435393339373265343064 -3432313033613134363266376239323638666663303434340a653366623135333234613932306361 -31623634356237333161343566613962346430313763386165303635626163316132333331396431 -3232663838306133350a613866316563363462633765303966646263316634363938633832643635 -31343030353134616663616161343532356265303764626639366638323331366162383636386361 -37333937623263396361316232396130376130633439303263323132633263333330303836656562 -39363464333036346331613162373638663036383835376561326638366461363464363739323733 -34386339383666646136303563353761386336646636396139626430386438306133643032396264 -62343738336561323765333863643162303433633338623833306339343436656435333531353639 -36353130653966633832343662366537353264613536616531363764323936313137663834613661 -32386365346566363366326637386536313064363166336265383738626130626432313339376564 -31303863363231383933643533393837656262633565323532616335383831663233386331653131 -63303030306433623237386234323431623539646231626636363962633431306330313463613532 -65633063366431373335396433623261643538323135343862323638613931336461346164333930 -64623130643939353732633035396438326664653330373361386537336461636363643662353738 -64303734366339366166333131353434343066326339346231356462383833333963633634363838 -62376231653363383137356136643139643534663837646261333565376234383335626137613930 -33633731383938343161313830376432653432616335303333656262353936353563633461393965 -39336263636361663064636431613565323433663535633136653663326138626534636563363931 -66323530316134353137303131356263306363316661366665313934303032313633646537393334 -39333562386533646239646362666436376334353730643864313535333562653361356431636437 -36313965336334333434613033366161333033626336393238386331653665633238353366336339 -33333465666437636362626330346335363439633132646636633565663432303437393236663965 -39376630386366363739616266653864613636316535323332666135366264316335623630663161 -66666265656664616365336662633532346662653662656361303633386265643433333463616332 -39363636333361323235393839383963656234346530383864326337323333323234643632323439 -34373664303639326331363865353562376630666464353534393432663161666634386430343330 -33356364616437306435396634343433353730316562613135363833663463616139323364663839 -38356232333337336138366538656337303765393934356531333432373532643964363838303235 -66346439333937633261376231336662623033623334646561373963653737646531363837316533 -30626532626664623335626531663762386663663732373537653361346638643833643365646330 -33383830343765346536383564663961656437383231653433613964643531316339653061346432 -62363533663234343237616461386333333632343063616530363363373834396661396365316631 -39363632643563386233316338626238386539393866346666616531663432383866313835646237 -35663339623061643138373864326139666438663464636665656235656435346561656535343562 -38323537376636333035616431643733386166636235646135653433386565663931356363656538 -31323339306261663664633137633235653362623434643633373534663237323864346466333233 -66343432346264643130363764373964326435383134353166363135303564303032353636326238 -35346638323764353062383130393264346435616465626633623938396333386362366465666539 -63646338623035643238633730656237313265633764613338366234323663333637623238646431 -34323638643734623634666662653639333165313166373932326434313238663666363937393862 -62326164636664336630616134316333623035663030636665396537623563323133363632613934 -32393163333737613965646630666433363333303265313561353534313335346563316265663464 -66303034356634633764663739353839626333316336313639393463363030393261313834653464 -38613363646161643661306137396262616436663838313437626530666336383637356365336366 -31336562303539333231626239346666646262386238353066323861363063353437326364653934 -32663762623732343565336535366361383232636636666438326462626339613933666633316366 -33386262323461653938 +61356632323462623938313963613666396262343731623838333663393837353033636565303930 +6333376565393630653962323238376664303539633936310a373966306638393832303333626539 +66346432353337613364613065633837393062376130356235383961633231626164666535396364 +3266356633623766390a393133653364633863616231343638376338636234353238396332313862 +34323561653739326532663833373139383464396164323435373930636431643037633138633534 +34663061653962363733363964373133663834636639343432333430613837386337386437343739 +61373636316531386665316436646133316637613864323738303331393566336461366331303930 +30643937383631633935303038316132313538656536353730646431313032633237343438633463 +36636536636363613031623136623462373231306332613738393364626436666562383966336365 +33343965633735346137396134376164313332343162343862636238356362633566636464373965 +33366166343239343037383933303665303130663836333730646236363465323037363538613663 +32363962363539336637653135323833643330633665613137303639353434343461353731633363 +33643362373934343239616230323262643638663362363133303732393037653732396631653534 +36653162663363353533326565313332373238396633643939353336343962653435643735356134 +39353934333535343737313264356130653261326336393262326532663433303030353132346366 +33393230613162373738353632663765643661313932303433653537643732636433393137356334 +37613232396238323166616435346165323530313865313130323133613732333166613838623664 +33316431643231306131333739343638653538653532313637326535666363356366303661633332 +61656461336431306139306166613537383136353338326661336631373938366466323561356338 +37393738613036653437303930306665313061376639353634376261316130323730386634346531 +36663536653164356662313461336633316565386236333936636466336264333637323037303466 +30663631666332356662323537383131363035343863646331393963346137646537666562393737 +31313932356664316464356634623335623639663830613237376132366130313038636163343630 +34653938663664316462653032333236353138303263656431306432373837643832303031323863 +36643031666362633366343966643765373636313136616330633230666265653662623064356235 +36383561646662613766303137356230636461646438646562646463616332306233393464643032 +34383631383234363931623338323264646639383435613237386266626634646636383633386130 +31313962643235373639636563653032303631613239336630626539393539613630653838336465 +66336663356166633535303265336534316435366236656531356431353233336237333263386639 +37646562643732613762326663353461626134313432643763656464326132393130656537623861 +61386337383937623231323034376535643439373533366130633233333063386439313339346665 +33656536393361326537313633363465373664353138343266363631316432343634383963356666 +62626430623330353061643764613066326336356632666237393031616136616236363365386539 +62636664653938616464376133306230623362623035386132366665663865626461663665663334 +33666135313838663532343735303865313430626137326561623164636433383061383730363532 +33383466646535333039383630613432353739303162616663306263303231376334623932306230 +32646162376635373930333165643632346537393839636164343465373834343261373133633466 +37626564633836633365326466323535666336323134303731316237663839633437366433653132 +33393038303930316366356130316332363638336263633234333763373533616564613633303765 +38633763386231396432366330316636626565656539343165663239663138393337633633326663 +37343533363066363235666531376639353262373865363833376663366564333535666332643132 +61396530396531666161343765316565646436633032396133343036346364336338333962303038 +32303162633465646565373963323561363031363439386231373434636661643138666461376334 +36393166386461336630386465323231383930663239353134333530663431363331633530613961 +62313733653331616264623038393666373832663131636436363832353236373434653966373532 +65393836366663363661366564646433663839653233353339333837363130623931316336333664 +32646561323339366635643265346366323964316665623536643530303462366663383739316264 +30646339373063366238316331636363316637333437396333363465393665393663353132366465 +36386361643763613039393630636332633432393833393631353066383736613339383736343231 +62613963393662396235343438303661623836333539323731646566393865666362346564333235 +39653337616563643862613935363239623138303630376235623335366334353930353439376232 +63313239646430656131363733613036666366633732393530623137663236626634373962313961 +32626637383761383865306232363664306365333436633531646166353130643730306537316461 +63643362316632613430633632633331356133303833393166333333333961386461383532336337 +346530343132623239303037343434323762 diff --git a/hosts b/hosts index 858065d..2e5e611 100644 --- a/hosts +++ b/hosts @@ -22,4 +22,3 @@ sodium.binary-kitchen.net krypton.binary-kitchen.net yttrium.binary-kitchen.net zirconium.binary-kitchen.net -molybdenum.binary-kitchen.net diff --git a/roles/drone/handlers/main.yml b/roles/drone/handlers/main.yml index 39f5285..19b4423 100644 --- a/roles/drone/handlers/main.yml +++ b/roles/drone/handlers/main.yml @@ -1,5 +1,8 @@ --- +- name: Reload systemd + command: systemctl daemon-reload + - name: Run acertmgr command: /usr/bin/acertmgr @@ -8,6 +11,3 @@ - name: Restart nginx service: name=nginx state=restarted - -- name: Reload systemd - command: systemctl daemon-reload diff --git a/roles/drone/templates/drone.j2 b/roles/drone/templates/drone.j2 index 1adc890..28c5b4d 100644 --- a/roles/drone/templates/drone.j2 +++ b/roles/drone/templates/drone.j2 @@ -1,7 +1,10 @@ DRONE_AGENTS_ENABLED=true DRONE_DATABASE_DATASOURCE=postgres://{{ drone_dbuser }}:{{ drone_dbpass }}@127.0.0.1:5432/{{ drone_dbname }} DRONE_DATABASE_DRIVER=postgres -DRONE_GOGS_SERVER=https://{{ gogs_domain }} +DRONE_GITEA_SERVER=https://{{ gitea_domain }} +DRONE_GITEA_CLIENT_ID={{ drone_gitea_client }} +DRONE_GITEA_CLIENT_SECRET={{ drone_gitea_secret }} DRONE_RPC_SECRET={{ drone_secret }} DRONE_SERVER_HOST={{ drone_domain }} DRONE_SERVER_PROTO=https +DRONE_USER_CREATE=username:{{ drone_admin }},admin:true diff --git a/site.yml b/site.yml index fe8c3fa..853f41e 100644 --- a/site.yml +++ b/site.yml @@ -8,7 +8,7 @@ - root-keys - name: Setup unattended updates - hosts: [sulis.binary.kitchen, nabia.binary.kitchen, beryllium.binary-kitchen.net, boron.binary-kitchen.net, carbon.binary-kitchen.net, nitrogen.binary-kitchen.net, oxygen.binary-kitchen.net, fluorine.binary-kitchen.net, krypton.binary-kitchen.net, sodium.binary-kitchen.net, yttrium.binary-kitchen.net, zirconium.binary-kitchen.net, molybdenum.binary-kitchen.net] + hosts: [sulis.binary.kitchen, nabia.binary.kitchen, beryllium.binary-kitchen.net, boron.binary-kitchen.net, carbon.binary-kitchen.net, nitrogen.binary-kitchen.net, oxygen.binary-kitchen.net, fluorine.binary-kitchen.net, krypton.binary-kitchen.net, sodium.binary-kitchen.net, yttrium.binary-kitchen.net, zirconium.binary-kitchen.net] roles: - uau @@ -57,6 +57,7 @@ hosts: boron.binary-kitchen.net roles: - gitea + - drone - name: Setup jabber server hosts: carbon.binary-kitchen.net @@ -93,8 +94,3 @@ hosts: zirconium.binary-kitchen.net roles: - jitsi - -- name: Setup drone server - hosts: molybdenum.binary-kitchen.net - roles: - - drone