Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add inpycon2019 and make it the default #22

Merged
merged 1 commit into from
Feb 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions salt/roots/inpycon/in.pycon2018.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
location ~ ^/2018/(.*)$ {
alias /opt/inpycon2018/$1;
}

location = / {
rewrite "^.*$" /2018/ redirect;
}
7 changes: 7 additions & 0 deletions salt/roots/inpycon/in.pycon2019.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
location ~ ^/2019/(.*)$ {
alias /opt/inpycon2019/$1;
}

location = / {
rewrite "^.*$" /2019/ redirect;
}
11 changes: 11 additions & 0 deletions salt/roots/inpycon/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ https://github.com/pythonindia/inpycon2018.git:
- rev: master
- target: /opt/inpycon2018

https://github.com/pythonindia/inpycon2019.git:
git.latest:
- rev: master
- target: /opt/inpycon2019

https://github.com/pythonindia/pyconindia-archive.git:
git.latest:
- rev: 72613218a3ad7123da3804e3df0c19f01c0a684b
Expand Down Expand Up @@ -74,6 +79,12 @@ nginx_inpycon_dir:
- require:
- file: nginx_inpycon_dir

/etc/nginx/sites-available/in.pycon.org/pycon2019.conf:
file.managed:
- source: salt://inpycon/in.pycon2019.conf
- require:
- file: nginx_inpycon_dir

/etc/nginx/sites-available/in.pycon.org/old-pycon.conf:
file.managed:
- source: salt://inpycon/old-pycon.conf
Expand Down