Skip to content

Commit 6fd3069

Browse files
authored
Merge pull request #28 from pythonindia/inpycon2020
Add inpycon2020 configs
2 parents cee0b1d + 7238a42 commit 6fd3069

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

salt/roots/inpycon/in.pycon2019.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ location ~ ^/2019/(.*)$ {
22
alias /opt/inpycon2019/$1;
33
}
44

5-
location = / {
6-
rewrite "^.*$" /2019/ redirect;
7-
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
location ~ ^/2020/(.*)$ {
2+
alias /opt/inpycon2020/$1;
3+
}
4+
5+
location = / {
6+
rewrite "^.*$" /2020/ redirect;
7+
}

salt/roots/inpycon/init.sls

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ https://github.com/pythonindia/inpycon2019.git:
2828
- rev: gh-pages
2929
- target: /opt/inpycon2019
3030

31+
https://github.com/pythonindia/inpycon2020.git:
32+
git.latest:
33+
- rev: master
34+
- target: /opt/inpycon2020
35+
3136
https://github.com/pythonindia/pyconindia-archive.git:
3237
git.latest:
3338
- rev: 72613218a3ad7123da3804e3df0c19f01c0a684b
@@ -85,6 +90,12 @@ nginx_inpycon_dir:
8590
- require:
8691
- file: nginx_inpycon_dir
8792

93+
/etc/nginx/sites-available/in.pycon.org/pycon2020.conf:
94+
file.managed:
95+
- source: salt://inpycon/in.pycon2020.conf
96+
- require:
97+
- file: nginx_inpycon_dir
98+
8899
/etc/nginx/sites-available/in.pycon.org/old-pycon.conf:
89100
file.managed:
90101
- source: salt://inpycon/old-pycon.conf

0 commit comments

Comments
 (0)