Skip to content

Commit 81d368a

Browse files
committed
Merge #1286 (jupytercon2023 changes)
2 parents c0ea18b + 8f03928 commit 81d368a

File tree

5 files changed

+56
-5
lines changed

5 files changed

+56
-5
lines changed

ansible/group_vars/all

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ email_host_user: [email protected]
1111
email_host_password: ""
1212
git_version: main
1313
gunicorn_port: 10501
14+
nav_enabled: true
1415
nav_tickets_enabled: true
1516
project_root: "/srv/pydata"
1617
postmark_api_token: ""

ansible/host_vars/jupytercon2023

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
$ANSIBLE_VAULT;1.1;AES256
2+
63316362613533303466386561646666313335646437663666326635386230396231303766646561
3+
3130323136613233313366613339353331373235323839310a623165356432353933303633323666
4+
64666338666263643934656138646231376135343964386262363137373263323764316239656336
5+
3238396463653634630a346462346633636566313033653462623636363664383630633265626531
6+
37383935313462613731343238326633396530323039636531626632323564393530633835663331
7+
37383333356463633539656637396664623461653865353534326163313035626637353330636564
8+
35333662653037633061306161353039333233663231643734613664313336633666633234653865
9+
36636537646364303561663165373931616663316330393235613965333930303261343464323866
10+
63353032613938653232626539666665383965343038336663353062316333343963316261323066
11+
66393662366132346539353034336661333566636165396338613533303030636335353231356333
12+
35643665636466643663313630396661626235386461623134313332356638363536613531383264
13+
33306335653562376535616262353663623065383461336163363166343237366164303566393839
14+
37366233386363373436353835363165353032336561383336346337643264356163643734363437
15+
61653237616563623037346435326133383264656535633833396565393766356566353030383830
16+
36353230646633313633326561373161383932303963303166333730386136313661316636383234
17+
33366236363161646339376664643631373531646662636630363832666637313861383539623464
18+
38393932383064656530313431366336333565306233646637373064656663303038653038303532
19+
66663166386433363133313738616631373262393433663935353938316232316462353434373061
20+
62373730353334353732353433306135626463623332396239643635633233616433383462653235
21+
61333432326135386331393539393165613234626135303936656536663832353637343461313330
22+
38623830366337303062386462383135323635393835306631376561633463343738653332643134
23+
34633463303165626362353131346239666136616166656462366537643139303930653462353163
24+
31333738633436626265313333333464333261323330376533346233343736633164303262623638
25+
38323239646632313134313863373766326432656534636638353230633837653565313231613334
26+
63353962393163363030333433363138383833393230646661653239346365396665366162633731
27+
39353562393839633638383234633732343931653835643031353161346335376263613863303031
28+
66396334663564346639653334363563623731343331333964393531383164616262326233366637
29+
33363435626663386636323034303038383230343439366536646333336166613935393061313538
30+
62393964356361613230633238386338656538643632666364333139376562613430653264623233
31+
34623535626561636666646239653066633961656265353931653061373634363662376264616566
32+
66353631396362373133363231333230646661336632326665336666313062373932376661366361
33+
63313433343237343061333462666565386465633863386435626562316665646538653966626433
34+
66313961316534616565653333316662626531386538626338393035363735313366396261363531
35+
31303238613466353534633331323536613264313764346466353331366263333639396362613662
36+
32613738363834653166336438656663643863363734643138363230663363656634613237386662
37+
61616264356630386464363136393038636264353761643765343539313134376138373739626132
38+
30346431376639306562376436346563336631323934313834356464663139323632356239626231
39+
66633634653530356537393230373064323933616637613766623866326365363639383137616236
40+
31353331363464643834376661376334656563336634303164326431646265386266333939373230
41+
36326138656161373063626466656331653139633530336232356464353531396636663561653030
42+
37643062663336636434343430333239623864633162393664613965623436396233333132343432
43+
61343734336663663933393631303235393734343536613537666464353137343031373566336562
44+
63373462663464633038346135643534653163353931353964333661323337363061623266306235
45+
64623264633565613839383335633766613661363536323265363136376134393435306236383263
46+
30313564383738333933613933643563396563393062616433666335306638386464336166323733
47+
34653964396663303336346135623036616366663062316563333633313036326331353232306131
48+
31306336636433303766323663303565666534386461303635333663356335386131366432313137
49+
65666166303332653564

ansible/hosts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ production:
1515
hosts:
1616
eindhoven2022:
1717
global2022:
18+
jupytercon2023:
1819
london2022:
1920
miami2022:
2021
nyc2022:

ansible/roles/web/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
- name: Import nginx tasks
55
ansible.builtin.import_tasks: nginx.yml
66

7-
- name: Import letsencrypt tasks
8-
ansible.builtin.import_tasks: letsencrypt.yml
9-
107
- name: Import django tasks
118
ansible.builtin.import_tasks: django.yml
129

1310
- name: Import pretalx tasks
1411
ansible.builtin.import_tasks: pretalx.yml
12+
13+
- name: Import letsencrypt tasks
14+
ansible.builtin.import_tasks: letsencrypt.yml

ansible/roles/web/templates/pretalx/common/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h1>
8080
{% endif %}
8181
</a>
8282
</h1>
83-
{% endraw %}
83+
{% endraw %}{% if nav_enabled %}
8484
<nav class="nav bg-white mb-0" role="navigation">
8585
<a class="nav-link" href="{{ content_site }}/">Home</a>
8686
<div class="nav-item dropdown">
@@ -99,7 +99,7 @@ <h1>
9999
{% if nav_tickets_enabled %}<a class="nav-link" href="{{ content_site }}/tickets/">Tickets</a>{% endif %}
100100
<a class="nav-link" href="{{ content_site }}/schedule/">Schedule</a>
101101
</nav>
102-
{% raw %}
102+
{% endif %}{% raw %}
103103
<div class="d-flex" id="header-row">
104104
{% if request.event and request.event.locales|length > 1 and not is_html_export %}
105105
<div class="locales">

0 commit comments

Comments
 (0)