Compare commits

..

No commits in common. "231c9e62cc29a3f968d4c658f3cecd61c4c37337" and "7926457cda261abdc0df46af3fcf4f618f0f9402" have entirely different histories.

6 changed files with 94 additions and 97 deletions

View File

@ -60,12 +60,12 @@
io.containers.autoupdate: "registry" io.containers.autoupdate: "registry"
traefik.enable: "true" traefik.enable: "true"
traefik.http.routers.drone-runner.entrypoints: "https" traefik.http.routers.drone-runner.entrypoints: "https"
traefik.http.routers.drone-runner.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/ci-runner/`) || Path(`/ci-runner`))" traefik.http.routers.drone-runner.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/runner/`) || Path(`/runner`))"
traefik.http.routers.drone-runner.tls: "true" traefik.http.routers.drone-runner.tls: "true"
traefik.http.routers.drone-runner.tls.certresolver: "wildcard" traefik.http.routers.drone-runner.tls.certresolver: "wildcard"
traefik.http.routers.drone-runner.service: "drone-runner" traefik.http.routers.drone-runner.service: "drone-runner"
traefik.http.routers.drone-runner.middlewares: "force-trailing-slash@file,drone-runner-prefixstrip@docker" traefik.http.routers.drone-runner.middlewares: "force-trailing-slash@file,drone-runner-prefixstrip@docker"
traefik.http.middlewares.drone-runner-prefixstrip.stripprefix.prefixes: "/ci-runner" traefik.http.middlewares.drone-runner-prefixstrip.stripprefix.prefixes: "/runner"
traefik.http.services.drone-runner.loadbalancer.server.port: "3000" traefik.http.services.drone-runner.loadbalancer.server.port: "3000"
traefik.docker.network: "traefik-drone-runner" traefik.docker.network: "traefik-drone-runner"
env: env:

View File

@ -58,12 +58,12 @@
io.containers.autoupdate: "registry" io.containers.autoupdate: "registry"
traefik.enable: "true" traefik.enable: "true"
traefik.http.routers.drone-server.entrypoints: "https" traefik.http.routers.drone-server.entrypoints: "https"
traefik.http.routers.drone-server.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/ci/`) || Path(`/ci`))" traefik.http.routers.drone-server.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/drone/`) || Path(`/drone`))"
traefik.http.routers.drone-server.tls: "true" traefik.http.routers.drone-server.tls: "true"
traefik.http.routers.drone-server.tls.certresolver: "wildcard" traefik.http.routers.drone-server.tls.certresolver: "wildcard"
traefik.http.routers.drone-server.service: "drone-server" traefik.http.routers.drone-server.service: "drone-server"
traefik.http.routers.drone-server.middlewares: "drone-server-prefixstrip@docker" traefik.http.routers.drone-server.middlewares: "force-trailing-slash@file,drone-server-prefixstrip@docker"
traefik.http.middlewares.drone-server-prefixstrip.stripprefix.prefixes: "/ci" traefik.http.middlewares.drone-server-prefixstrip.stripprefix.prefixes: "/drone"
traefik.http.services.drone-server.loadbalancer.server.port: "80" traefik.http.services.drone-server.loadbalancer.server.port: "80"
traefik.docker.network: "traefik-drone" traefik.docker.network: "traefik-drone"
env: env:
@ -73,7 +73,7 @@
DRONE_GITEA_SERVER: "https://{{ inventory_hostname }}/git" DRONE_GITEA_SERVER: "https://{{ inventory_hostname }}/git"
DRONE_GIT_ALWAYS_AUTH: "false" DRONE_GIT_ALWAYS_AUTH: "false"
DRONE_RPC_SECRET: "{{ vault_drone_rpc_secret }}" DRONE_RPC_SECRET: "{{ vault_drone_rpc_secret }}"
DRONE_SERVER_HOST: "{{ inventory_hostname }}/ci" DRONE_SERVER_HOST: "{{ inventory_hostname }}/drone"
DRONE_SERVER_PROTO: "https" DRONE_SERVER_PROTO: "https"
DRONE_AGENTS_ENABLED: "true" DRONE_AGENTS_ENABLED: "true"
DRONE_LOGS_TEXT: "true" DRONE_LOGS_TEXT: "true"

View File

@ -1,15 +1,20 @@
http: http:
routers: routers:
cockpit: cockpit:
rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/admin/`) || Path(`/admin`))" rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/cockpit/`) || Path(`/cockpit`))"
entryPoints: https entryPoints: https
middlewares: middlewares:
- force-trailing-slash
- drop-xforwarded-proto - drop-xforwarded-proto
service: cockpit service: cockpit
tls: tls:
certresolver: wildcard certresolver: wildcard
middlewares: middlewares:
cockpit-stripprefix:
stripPrefix:
prefixes:
- "/cockpit"
drop-xforwarded-proto: drop-xforwarded-proto:
headers: headers:
customrequestheaders: customrequestheaders:
@ -20,7 +25,7 @@ http:
loadBalancer: loadBalancer:
serversTransport: nocertverify serversTransport: nocertverify
servers: servers:
- url: "https://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9090/admin/" - url: "https://{{ vault_domain }}:9090"
serversTransports: serversTransports:
nocertverify: nocertverify:

View File

@ -1,86 +1,80 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
30663733363338333134613333316434633861386238613634303762653635326631353737323330 38343663613164616165313862356365343939336537653566313831623633613732336635313164
6466356331313639613666616631633036376339343236660a323631613662313162316537366136 3633356634376334643136323431306261366134376637360a323339346463373637373965336337
62653630643732643735363136356230356333363232663632373730653264643563343061303930 63663130636364633334626237613430313833386165646231353639346466393535623838353337
6530366261643938320a353264663234346465356666333233643533303962303134393331373137 6463303161343630640a343433383465343432323032653861366233363761343931353764343236
64316365363035346435613734656338333161613066393863363531646230346233633430623239 65613763653334353461363966663832366632363565656537646366346637623837366663346464
61353437386434393135376234356464313533303861663662376434333838616437623132353438 33656634373163306537393631633239626432643963646534323739633266373130363535613136
63333365353837313738313464306431313137356634323563356234356630316166303030313765 61353933666130363765643965623030623737386264636632386635626266323563613133663165
61333134346237323261626662383833616236366132353333373532373130376332303664353164 63316438623732613361333136353230313763396463363233633266393862333238363331363231
62363735613933626338376666353364366239353466646434373961623666663033363630306663 33343963626533623931306637353236323065616631363633623433366634346331316637393565
32623132363836666365306161646631386631633966363034303932303361333834313931363034 39643564333065353866616566643436383630666439623730376561663831376566363132316230
36643364353363323331643735636363323132336438383765363937356239666662336330653330 61663938366566653165383636343138366437636361663764643939636233343532373131346361
32653364316363626636386232353334343337643163383435303339313937613965313963646666 66363433656338316434646166666331323538393139623632613837333933353932333464613134
30356465653162336638313439613965316630656661333061663033643033653564353635386233 36396232333461353930623935613364343333356133396530653330323963653665386461383664
38656636313137333464636431646239376661343833333239646161613838333131363031396233 38666433623135316161326661336561376262363361376135613035306532626238633262616234
65326431323763336334613262363162643335656265326364383237386561366434656630666533 64336330386565663034333662373331343931323937646436323666633439333864363061386164
63623037316264373865616230623465333638306561633332663366363461613935653462623863 65623338396637303162373331346430613233396362613465356631316566346239326132396464
63346432383336333664346333623366323031316137313139303738306135636136346664376232 32626639656238666565636537663365316630653535656137303234653032363865396633656435
65633030373838643363333839303432306632623437646331623336386264393439376139343464 33373662623565303062346637363134393161313237656139356361653163393536386563636261
64346330623530663531653031316561646534663762653739363064353962386538666138323635 38386463646634336263623032653433336334326666376166653739656165343965613466663238
66663639646264623765363763663030393564396335653864343061343036623135376463663565 31376534383065366635386563656334623232383730626663393765663834613862656139656464
39343839333635636434336239353536363130396337633065643039316233666436623464633166 62373062633539396632323536373039313031366637653464313735656534336239343838316464
64626461656634353239343239326130303935303663303464336633643961396664386265653339 65366538663464353064353864346432383866313935626633633434636436653863393735626639
31343236376364316566363437653765373236653463623132626530626363373364353633376131 32626332316439326661623233333032356362373537663366633538313761616435366639346230
37623831323334323439313563653734376361363361373431653862343561323133346532646161 30633234616331336631336431633037633066616237623736663661313464303934373565663136
62633239363736643531623338353930396261303836646137393333373466363963336265656166 31353265386237363031323262393232353766303763626565666438643339336235393936366230
37373631323836343833333263303037356435333961356466343438666663373965663563646533 32623636386334326235663061623236393066326666326337343635616366313436626662316237
64366163366534333739366466656265326234333137313933663363653161393062363336393466 34636661396139373863663130386631333437643665333631616234333730623032376237646432
30616635313737346133663163366331333161303163346239653266353862343564326434373935 34396631613766346630333831643035393538356234343134313466386335633539623335373265
37626533646331346263333737633330373364396433323634313365343463373539626665343463 30626330303939653362353364376331643638336137616133326532336638633639326261313164
39323635323161396238323439316334333362376561636565333939303562396534376337303662 37353638306138343939326632393634623432383531346466643931343839666137383637643930
37373832386337326430386531623163353265303763363561353035653562666532316261323662 35646531656235396137626535323162396163323330646535663639656136346165356434363065
33303536326437653065343464373261303062633930336564626539333163626530333363643033 36636165373031376639623866373264613035353439643837623536326439336638646530316531
36383839386531613031383835623239366235393233373263373635656532646362343639356333 62343130326461636231626531636436663162396361633264633031373865623830326461313935
62663934646237646134376238653265663539383039346138623065386564366138333461653639 31353831303838346436373935613765646638373861346435393566333438383239393465643535
38363366386534663430636436613836383230663063326665636237656366376366653833396437 32316539623362383661643363336236346331346335623938653530613866333231643130353530
66653162316138363037346165313235633935353038333465623238373337626134663531313135 61633936623061646533613938353763343137623037363639393836306531333739383537343933
33666533396238306232366666666433653537643431363733643261663363336339633538386561 35353034373563633437326530616138336438333930326536616630356231316430613035643932
64356161663737663566636361663038343331636437373462336665316337666232393135663563 66663134613234356237363632393762356463383133353034323132376266636465313966316536
64323032343337626633356236356538366432643734383037336666366630633162386335363764 32353731343862306562396435653231376666363931636234323330383763613565303361646339
34383035636639316362313962353439373062616165323163313963616464393866353638643930 31333033653764333932373965613563356131373432393933643666653735633939316237353061
63633434366165306662383436643039653263386430623831623230616331333433346262636165 38653363626233353161363134333834363663303530343938313261666632356234326531313238
62333863653634343530326335656666373731303236653636663739313031363334333038393662 62356161343230646633633531333738376335396539626431373732313833613539343531623066
38616435646461646438303865666230636561643635626636393465313133646565356362643761 32303237363161396439623131656163626132303765326461306632323435343063653563656334
62303565666132626534653734666237633762386266613330663237323631333562663232373731 65613830653335386662663031653839363934656437343730303065396363636537346237306138
33353861313238363165626337363939376563343465306364373137623231313062633838303161 30316131613865393861383639663161303734336133346262383365323666623237386262663337
66333038306666363030326566613966303036636563633862333738346233336335363238343966 35663637393032633764623635343466363366316536643539306339363130316238633630336362
31656634376436366135643731663939353332633566323437653163323931393334633937656131 35393230393436393436383537646163613334363130336163636230633639623738623766666537
34363133623865613061303338373038663165656230643030663037313934343231313233636236 35356432326666663539313337306230313937616332653134346136363236383036653462363031
65623865623137333732303536393265353363393630343837656666616234393037316136343038 38643432356534396466656261373762633132363833663561613636316435666463343135393363
39326466363836643937656163306661396239333665303133363133613066613034386162633361 65623063626564313131383534313661356637396166383930643936303337666437643861323931
63353731393861396337313266633564396462393364643831333235366433303764303266613163 38333238373866336433356561626561306330313034626233616533663866613930383735393336
30646630363862303965376636346133316135666535643135393935326138346162336436626533 61666339636466376633643731303065333337656162396634343032623939656231633838613136
62346661333263636363313134336435323330646262303934346138663131333631326234353263 66386233663231616638616163363430636233346465636461313864343436323664316638636132
38643165646131656639363235366530353366353464343361656536373639653238366438643335 66376466343662343938356537333730646265393032613738393832646364323737363437343538
36376331316264333263613037636263386630306430623437383061383631366662633435643337 31666436666664353161626462316161326262363166373835653462643935356465386132656233
37336236336164303839386536333630343363373066373534626330653532313335383863623866 64613839353235663564633765653936306261303639343265653765633131666366363930643634
62376438616162343832613365333765306462636535346330373230333634383263323961363563 35333039326130656234626135663031343839336633373564333930313134383630646566386261
62326363383464353536643035653966643239306338346238393838323363643134373363613231 65306237353235333865643666353064383663663234386233666164313461633738396465366139
63653063333931303739623935626531376433333766666562633837623431313031653163373731 36646335663461303736646362343534623334366134303138323535656635316433356230663137
39363238643064366133626662326335656331646238366565316463663265393630653839656331 39633939613563353761376339633031623531633262326164326630343239633434666665386566
62323865346565323030396261316566656265346331316261393861303634363266323435303930 36633039653161316135353463373331373937393864643338643633656530313431646530303737
37633765626637653666623663366664333837336166333464313865383234643531363438393837 65386337323235663263306163616136363030363634373536366331646439336264366664613664
35656363396265666633316533376337323733363737633264326230663161623365653033376431 36323235363838653062313863663864336262646236653466313534663461636637303434333362
38323332383635313339356339396535396263343036343861633530313537643766633432373336 62653364316535393237383864646237633064656337393932383038623331633738343235323333
65316161316232326432623363633365326265653531613532396438623961326632636235396661 32646333316432623733646437383836376666626139623261386635333433373536613435396136
37343939663837323864326237393632343537366166346537666136303961373436626663326463 34393033663332303634616261333236383565653934303437396134623130383836643035386638
37376230646565343739376438633335613062633061333239326332656666623031393135376139 37616561353130656439373863656466636361646234363337343766613938323836373866656666
66373665383935353830666535343965333637356561653066346364656665383134613931356261 66663035333032616262313734323536616331633337346333343634643064643862663030653434
63623432353532373462613365326165643130393662366462303631396464306265363837306463 64633939623731633232363734306137616434373466396561313961663931373162333138373533
37373262623864333833383463346233326130323662313763623861323430306163383538623331 33393562363632383665633938316139623238376536316332376663313661316361633337383431
66366566626135623838656163373932386234333361383133623031663434373732356366303930 34316337643664363462636364666637623036323861636231373539643134633937366166376233
30316662663534333765366531313162336361623065363061396135343837633962613165666435 32663730316230626337396165333034313637373435623933313966386330633634646134323865
34653435353635653061656665363261613430623766333564343030326438343334363562373364 65383636376632373363306430653039353039393738646133393635383038366662393634346265
36653034653631643566666562383663303434383238633033316330386664373764626330363837 37623931343664383665666130656432613038343830383531613435333336313362343333663831
32313330373138386362366364326665373538613737343563343130623365373065363337353834 35313734326666396566633132663735373162323937323064336133636264313338373462386339
35323935346466313564346261316633616133396532356131346635343038323434336535316633 39636635353130646237323834393963396238653633623161653539636263316534636461363437
35613666323234633962313063333861643466643336386161623335386136663137643632623461 64656463613565636231336635613937383537393561353463343530376238623532366335366430
30356665343234353061633163656230636233303634326663643336623739326639643735343237 35363739666335343436643433376432633762623661376161373539633662323633643939316134
30633265386239306462643134323164393032363663353738633464313362666563303539326636 663339383635626333363365323634623535
61373738663932353137303639326435363062346234656561313039636365373133313331363634
33336466373436663030623039306130346464356563303461633731316637336464353164356331
32323764396431343763666363653430353232633563383436393533613234346237323735396435
62666233366436333461626561613666643930626130623037643332386263366431376638623030
31646538643130623261303662393338396338653939343066633863653439643263303364303334
3666

View File

@ -1,4 +1,3 @@
server: server:
hosts: hosts:
chef.heaplab.deib.polimi.it: chef.heaplab.deib.polimi.it:
ansible_port: 24

View File

@ -1,4 +1,3 @@
[WebService] [WebService]
Origins = https://{{ inventory_hostname }} wss://{{ inventory_hostname }} Origins = http://{{ inventory_hostname }} ws://{{ inventory_hostname }} https://{{ inventory_hostname }} wss://{{ inventory_hostname }} http://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9090 ws://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9090 https://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9090 wss://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9090
ProtocolHeader = X-Forwarded-Proto ProtocolHeader = X-Forwarded-Proto
UrlRoot=/admin