Compare commits

..

1 commit

6 changed files with 86 additions and 151 deletions

View file

@ -1,67 +1,58 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
36303830393964636165353932336334643761653732643036303563313439623836626231313739 32393230646466336565653530386632356235653437356237393163313033663066393963343031
6239326131333263383438613161353435393036663162310a646237306461633337383838306139 3339346530316430666632666230316165663564313464390a666539666265326235666266306231
37303434653266303866643162306433636532333131366132366431303766306232653837653463 38383466343364646333343132333338306434613961663765353566353166626539306335653537
6139336230306131660a636165373732313930396632336532366239303766393937386135306235 3466326433316166370a376639363235326363323234313630336330613733616362653838396464
62633837363138323365646235333137646363626430633339376636333838663738316535396161 36623733643261633730306537613132333432333239353638636363646464633665643832646238
66653931666565353337623336636338383035333133643639323739393565396434373734323235 34663635343437643534633232346466373336316664343335313435366636303136303239643834
34306132666430376537643431343362383734343861633332373838383837316266336131353231 63623436323831613862343938303137643735336637306433376237643032633738376563666265
31356665313333343139303337633530643534376338343631396431663937616535306136343266 33383032643461653763653231333132633034383431303165646439393266616634386431313565
36323761653933386231386339666333306331326161306536616238623836306335373930386539 38656530306538343239323864303538376165313330623231646265626261303235343130653665
32326331366435386132393731633664333862656130636632656335353939656638613863633637 62363839346630343461323136363037666135373733303864623737313634316136336537323464
64366662623531333933613566356632383061656165323839623732306331653133393463373465 37633539396462313462386364373733313566373332343834353164393161636161356537303237
61363036613234353962353135366361363537313138626337376138383335633865663237303464 39646561376138613433633431626530346430356264653932636163393663356565393464393161
37373032353066323532313364333863663739613631633230323339346634663733326430343263 37313661633466636437623233623937353234313962633131383365396631643631346261386439
64636331616434343331333065633936313265393739353937396165363337366263393131316661 65393162633965353538626133636534336635623364353963626135333637343662353765633161
34643263343263306235326562663065343438363338326138653066326432646531643764396161 34373337653730333032396663306663653830643761633730663432366433346631363463323464
34343834643134363662373934346463383263636436346433303231656535626664626530326131 38356163363836636562376431373933623930643236636239663065306536396236633130306165
39303231646537316136653932306135303931333762343434623636623436383561353131303163 62343730306465333361663530363462666439343438633965393965623239623836333335366438
63373833656430336365316433663538643634303962623538663362383536613136366230396533 65336463333539303366376635303432643538666362643335393834336231646562366234623832
37363963613532666434653863623030653434303463616638653135666433613030656335396238 33623632653932636662653933623362356431393739646166353136346235333231643530323738
37356632376366383463343736303265326436383435363335333838313264333134653932616465 62643135386563353933616632363664363430393035343263393736393736623831666239363866
31363832656563383035306537376532343934373933306232333631363132616665663433666133 63333163646631396266366164633562653633333536663763643364616666323262666633663265
36643131386134303362373264356437333236663232373035363765303936313162353930353033 65386238366131343432646164383061373635346165303064626632303234663730356130636436
38303864643237323437653463313238613036386461303066353465336230303632613432353661 63396237313338656533393062363133643631346563303139306230333137383734333764616165
36313761303234303363346432666638323865663764623862623165633234363437653964343830 61303632393363396565383731353066633666353835313665303532656635356465343861613132
62656365363538303035326239663264646163366332306332383262356130356436366661383234 38613530376165376666303536303263383039613533393731396663376431616561656564316336
66643832656661623132303562333432656365323836363133373932333732323133383832623939 39613134666531303638323230316365333432376165303361303361383339363539353938633931
37333632623933656336316161376565653363633330646239666266313336306563366462376531 61373765366133643263373233626436333735393130373461383333613363626135666663633637
34623636646439366438316530386334313233613963643634366135373661373138316466313739 33633061316661313930333133343262666636343835633234383264613966656438646430316636
64623835613166616165383463323137303431303035363733366563623934366439323666653633 34333866616634306239333238356261333336343930353361656263326135656163353937316434
65663532343939343334616662366633353231636135346564643034666331616666316561386664 63623831333939653264326638366230333636663234303762393966386539653932346436303965
30636535633432336438663462356232383737393031383431666664303563623932666630653233 35383137323661663862313764653064353030626662353365623663653565623866626266333335
65323932303638653562663734386637323964333331356262346463333065633565386363393064 39633538303566333061383938383739396266396533666231316534323161666331333632663963
37646563366437646330353765623236306561646433636534666438323036373132363036626438 38383332623561383164336633316534326635323435356135383736303536643133383631393339
61393866626236316238326236656164643864343734353438313466633136343931376634366261 36353732393263626661346563356663356436363465393639613631366332353938663535356137
64353631363665366237356566323532306563333937343665393166336535383636303930346362 32393138323662646166386139653833313536656434363461383565636232333630653462343934
38333733306430636436623661653066313936626362373464396138343439376430626162316466 61363535363332353131393265353031643964303766363431343332666634353166303435303165
66623837353763333864663562653166316665363537636537626234666230636665396438313832 34356363326539383139396536643338316631333630393839623339616263666661366462313236
61613330396134666437306162386335613466383231633034393639366533363137613964383135 34303939623335353366613865363530333338643364633862336337373737653863643239386132
35356136393962353262313635343031323638326163336433303066393939646536653033343530 38633065623365326136656538663839313563313435653733336633613737393739623334303938
38303935663038303639616661346664666435393266653663373435363433386461633133343964 39623161353939663935373838316137633262373435353335323537363637623834363030343839
65633532656566613638333266393131653863336563386262643630633164346139383436326463 64666565633534326662636530383733396531613939613431646136396366323764393363343231
62316131363335376336366332323564383036333139386462353933316461346363626465396631 38393239663762623932626537613763353065643564303766663932346666393938616562376666
39616164316463323162616235653365363737373736646331303436303037333536633466303533 38383939643632313931343063323838613461633161643434353532623433303434396262363764
32663335386332663334653734303136333066636234643537393931626333303735386238373763 30303361303832363765316265346534313637663462303362633039363163356535356565343964
33323333646531633964613633356539636538306163303938373638623230396661663538653463 66653639356661373231653630646338393835656435386566623263353363376365353565333961
35396434303634316631376138336530393134353235383637326466306363313462323330623535 62646634323730633364366137326434663661383165373066303062396432373361346436316338
33353335306364323335316336643233386561306134636461336537353838373830373031616636 38663264663235333938363538353736636161633639383937336365323732353161643365616264
62333335616639353436303336653965303132316439316362303931373465376264396139346631 39643234643238646332613934343666323736666261366164383034303637623133303365313062
61393064326433366337613266306263336163393731633165303536636132636638656339373634 38353832353366383637626532386339306438333035313563333464326539363661633564316534
32313637666334313935613564316331396437343335313336666137366133376666306138383163 62613538356366343566303339383863343265633161396162353962356366333432623438343039
62383131616339393534613231616134383562346163343430323261336531306332363736396663 63303662643339636366623630616339363363633434383731376334323736373265326138356161
39643134633838393566643237656663313161326631316437663463653566343238343736656566 66336636613138666465623635343163386537376263353437333765323832333539386336326564
35663231623533323261326162356137646436643766646439663538306661643861356565666434 37356331343139653339313337383461333834353166353838643666376439376237353032363164
38353131363863666439316666353965663531323662376235636533363262353131323166326335 66613530633538666436366563343232326334613432363162383163383031343763653864646331
61656432666130313762376334656434333532636165313834333634646465346234653662393735 36303463316637336132353832643761386332643130353839363833346532626162643661366464
35643138623832646633666366616436323730383066323637316635336134356461353666636164 34336438306661343961663163386361316338303930343364656561326363623630303036616264
30633833313863656237653762373965376638393232376532666361396363303030383138616631 3232
32633739626565383161343065646232636464373538626330636466316337663739376638386337
32383763313064666464623137373036336562633734313663313463386430313838636165313962
31383466363466396337333837626462303434353739343338313137633736313664346239666237
62313462366136313037646264663533323738656138353235646136383334613035383236383865
38666432313761653234636363396361643139353730323237616663323433363463373666613765
31656430326138373434356130626465643733313065366562313566326633653832316265636538
35396164313932356432306639653461343063643666656265333033643863303637313031653134
39636436636333343030333762376463303538626665343434633236353236373765643231383933
3130336364366434306366623062613130616230366633333536

View file

@ -1,27 +0,0 @@
# These are the variables contained in secrets.yml
postgres_passwords:
fider: xxx
nextcloud: xxx
passit: xxx
gitea: xxx
matrix: xxx
codimd: xxx
mailu: xxx
ttrss: xxx
fider_jwt_secret: xxx
ldap_admin_password: xxx
ldap_config_password: xxx
passit_secret_key: xxx
docker_password: xxx
mailu_secret_key: xxx
drone_secrets:
oauth_client_id: xxx
oauth_client_secret: xxx
rpc_shared_secret: xxx

View file

@ -55,7 +55,7 @@ cryptohagen_website:
domain: "cryptohagen.dk,www.cryptohagen.dk" domain: "cryptohagen.dk,www.cryptohagen.dk"
ulovliglogning_website: ulovliglogning_website:
domain: "ulovliglogning.dk,www.ulovliglogning.dk,ulovlig-logning.dk" domain: "ulovliglogning.dk,www.ulovliglogning.dk"
drone: drone:
domain: "drone.{{ base_domain }}" domain: "drone.{{ base_domain }}"

View file

@ -3,6 +3,14 @@
docker_network: docker_network:
name: external_services name: external_services
- name: setup network for postfix
docker_network:
name: postfix
ipam_options:
subnet: '172.16.0.0/16'
gateway: 172.16.0.1
- name: setup services - name: setup services
include_tasks: "services/{{ item }}.yml" include_tasks: "services/{{ item }}.yml"
with_items: "{{ services }}" with_items: "{{ services }}"

View file

@ -1,51 +1,21 @@
--- ---
- name: set up drone with docker runner - name: Drone container
docker_compose: docker_container:
project_name: drone name: drone
pull: yes image: drone/drone@sha256:eb7e35bc1cb5ca797304aff65fe24031d26d8d3e2ee4671a8fe9e0fc6f479455
definition: restart_policy: unless-stopped
version: "3.6" networks:
services: - name: external_services
drone: volumes:
container_name: "drone" - "{{ drone.volume_folder }}:/data"
image: drone/drone:1 - "/var/run/docker.sock:/var/run/docker.sock"
restart: unless-stopped env:
networks: DRONE_GITEA_SERVER: "https://{{ gitea.domain }}"
- external_services DRONE_GITEA_ALWAYS_AUTH: "False"
- drone DRONE_RUNNER_CAPACITY: "2"
volumes: DRONE_SERVER_HOST: "{{ drone.domain }}"
- "{{ drone.volume_folder }}:/data" DRONE_SERVER_PROTO: "https"
- "/var/run/docker.sock:/var/run/docker.sock" PLUGIN_CUSTOM_DNS: "91.239.100.100"
environment: VIRTUAL_HOST: "{{ drone.domain }}"
DRONE_GITEA_SERVER: "https://{{ gitea.domain }}" LETSENCRYPT_HOST: "{{ drone.domain }}"
DRONE_GITEA_CLIENT_ID: "{{ drone_secrets.oauth_client_id }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
DRONE_GITEA_CLIENT_SECRET: "{{ drone_secrets.oauth_client_secret }}"
DRONE_GIT_ALWAYS_AUTH: "true"
DRONE_SERVER_HOST: "{{ drone.domain }}"
DRONE_SERVER_PROTO: "https"
DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}"
PLUGIN_CUSTOM_DNS: "91.239.100.100"
VIRTUAL_HOST: "{{ drone.domain }}"
LETSENCRYPT_HOST: "{{ drone.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
drone-runner-docker:
container_name: "drone-runner-docker"
image: "drone/drone-runner-docker:1"
restart: unless-stopped
networks:
- drone
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
environment:
DRONE_RPC_HOST: "{{ drone.domain }}"
DRONE_RPC_PROTO: "https"
DRONE_RPC_SECRET: "{{ drone_secrets.rpc_shared_secret }}"
DRONE_RUNNER_CAPACITY: 2
DRONE_RUNNER_NAME: "data.coop_drone_runner"
networks:
drone:
external_services:
external:
name: external_services

View file

@ -1,12 +1,5 @@
--- ---
- name: setup network for postfix
docker_network:
name: postfix
ipam_config:
subnet: '172.16.0.0/16'
gateway: 172.16.0.1
- name: setup postfix docker container for outgoing mail - name: setup postfix docker container for outgoing mail
docker_container: docker_container:
name: postfix name: postfix