update inpycon 2018 site, and make that default

Author: vigneshsarma

salt/roots/inpycon/in.pycon2017.conf

@@ -2,7 +2,3 @@ location ~ ^/2017/(.*)$ {
    alias /opt/inpycon2017/$1;
 }
 
-location = / {
-    rewrite "^.*$" /2017/ redirect;
-}
-

salt/roots/inpycon/in.pycon2018.conf

@@ -0,0 +1,7 @@
+location ~ ^/2018/(.*)$ {
+   alias /opt/inpycon2018/$1;
+}
+
+location = / {
+    rewrite "^.*$" /2018/ redirect;
+}

salt/roots/inpycon/init.sls

@@ -18,6 +18,11 @@ https://github.com/pythonindia/inpycon2017.git:
     - rev: master
     - target: /opt/inpycon2017
 
+https://github.com/pythonindia/inpycon2018.git:
+  git.latest:
+    - rev: master
+    - target: /opt/inpycon2018
+
 https://github.com/pythonindia/pyconindia-archive.git:
   git.latest:
     - rev: 72613218a3ad7123da3804e3df0c19f01c0a684b
@@ -63,6 +68,12 @@ nginx_inpycon_dir:
     - require:
         - file: nginx_inpycon_dir
 
+/etc/nginx/sites-available/in.pycon.org/pycon2018.conf:
+  file.managed:
+    - source: salt://inpycon/in.pycon2018.conf
+    - require:
+        - file: nginx_inpycon_dir
+
 /etc/nginx/sites-available/in.pycon.org/old-pycon.conf:
   file.managed:
     - source: salt://inpycon/old-pycon.conf