Merge pull request #27 from pythonindia/update-pe-domain

Update pythonexpress domain

Author: vigneshsarma

Vagrantfile

@@ -27,7 +27,7 @@ Vagrant.configure(2) do |config|
 
   config.vm.define "wye" do |machine|
     machine.vm.network "forwarded_port", guest: 80, host: 8082
-    machine.vm.hostname = "pythonexpress.in"
+    machine.vm.hostname = "pythonexpress.org"
   end
 
   config.vm.provision "shell",

salt/roots/le/certbot-cli.ini

@@ -10,7 +10,7 @@ rsa-key-size = 4096
 
 # Uncomment and update to generate certificates for the specified
 # domains.
-domains = pythonexpress.in #, www.pythonexpress.in
+domains = pythonexpress.org #, www.pythonexpress.org
 # staging = true
 
 # Uncomment to use a text interface instead of ncurses

salt/roots/nginx-default.conf

@@ -11,6 +11,6 @@ server {
         # listen 443 ssl default_server;
         # listen [::]:443 ssl default_server;
         server_name _;
-        return 301 $scheme://pythonexpress.in$request_uri;
+        return 301 $scheme://pythonexpress.org$request_uri;
         # return 444 'Real Programmers: https://xkcd.com/378/';
 }

salt/roots/pythonexpress/beta.pythonexpress.in.conf

@@ -0,0 +1,12 @@
+server {
+    listen 80;
+
+    server_name beta.pythonexpress.org www.pythonexpress.org;
+    location /.well-known/acme-challenge/ {
+        root /var/www/html/pythonexpress.org/;
+    }
+
+    location / {
+        rewrite ^/(.*) https://pythonexpress.org/$1 permanent;
+    }
+}

salt/roots/pythonexpressin/init.sls salt/roots/pythonexpress/init.slssalt/roots/pythonexpressin/init.sls renamed to salt/roots/pythonexpress/init.sls

@@ -1,11 +1,11 @@
 {% set ssl = pillar['pythonexpress']['ssl'] %}
 
-/var/www/html/pythonexpress.in/:
+/var/www/html/pythonexpress.org/:
   file.directory
 
-/etc/nginx/sites-available/pythonexpress.in.conf:
+/etc/nginx/sites-available/pythonexpress.org.conf:
   file.managed:
-    - source: salt://pythonexpressin/pythonexpress.in.conf
+    - source: salt://pythonexpress/pythonexpress.org.conf
     - template: jinja
     - require:
         - file: nginx_config_folders
@@ -14,16 +14,16 @@
 
 /etc/nginx/sites-available/beta.pythonexpress.in.conf:
   file.managed:
-    - source: salt://pythonexpressin/beta.pythonexpress.in.conf
+    - source: salt://pythonexpress/beta.pythonexpress.in.conf
     - template: jinja
     - require:
         - file: nginx_config_folders
 
-/etc/nginx/sites-enabled/pythonexpress.in.conf:
+/etc/nginx/sites-enabled/pythonexpress.org.conf:
   file.symlink:
-    - target: /etc/nginx/sites-available/pythonexpress.in.conf
+    - target: /etc/nginx/sites-available/pythonexpress.org.conf
     - require:
-        - file: /etc/nginx/sites-available/pythonexpress.in.conf
+        - file: /etc/nginx/sites-available/pythonexpress.org.conf
 
 /etc/nginx/sites-enabled/beta.pythonexpress.in.conf:
   file.symlink:
@@ -34,22 +34,22 @@
 nginx_pythonexpress_dir:
   file.directory:
     - names:
-        - /etc/nginx/sites-available/pythonexpress.in/
-        - /etc/nginx/sites-available/pythonexpress.in/upstreams/
+        - /etc/nginx/sites-available/pythonexpress.org/
+        - /etc/nginx/sites-available/pythonexpress.org/upstreams/
     - require:
         - file: nginx_config_folders
 
 {% if ssl['on'] %}
-/etc/ssl/pythonexpress.in.crt:
+/etc/ssl/pythonexpress.org.crt:
   file.managed:
     - contents_pillar: pythonexpress:ssl:cert
 
-/etc/ssl/pythonexpress.in.key:
+/etc/ssl/pythonexpress.org.key:
   file.managed:
     - contents_pillar: pythonexpress:ssl:key
 
-/etc/nginx/sites-available/pythonexpress.in.with_ssl.conf:
+/etc/nginx/sites-available/pythonexpress.org.with_ssl.conf:
   file.managed:
-    - source: salt://pythonexpressin/pythonexpress.in.with_ssl.conf
+    - source: salt://pythonexpress/pythonexpress.org.with_ssl.conf
 
 {% endif %}

…ts/pythonexpressin/pythonexpress.in.conf …ots/pythonexpress/pythonexpress.org.confsalt/roots/pythonexpressin/pythonexpress.in.conf renamed to salt/roots/pythonexpress/pythonexpress.org.conf salt/roots/pythonexpressin/pythonexpress.in.conf renamed to salt/roots/pythonexpress/pythonexpress.org.conf

@@ -1,4 +1,4 @@
-include /etc/nginx/sites-available/pythonexpress.in/upstreams/*.conf;
+include /etc/nginx/sites-available/pythonexpress.org/upstreams/*.conf;
 
 proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=old:60m;
 server_tokens off;
@@ -7,39 +7,39 @@ server {
     listen 80;
 
     # deny illegal host headers
-    if ($host !~* ^(pythonexpress.in|www.pythonexpress.in)$ ) {
+    if ($host !~* ^(pythonexpress.org|www.pythonexpress.org)$ ) {
        return 444;
     }
 
-    server_name pythonexpress.in;
+    server_name pythonexpress.org;
 
     location /.well-known/acme-challenge/ {
-        root /var/www/html/pythonexpress.in/;
+        root /var/www/html/pythonexpress.org/;
     }
 
     location = /robots.txt {
         return 200 "User-agent: * Disallow:";
     }
 
     {% if not ssl['on'] %}
-    include /etc/nginx/sites-available/pythonexpress.in/*.conf;
+    include /etc/nginx/sites-available/pythonexpress.org/*.conf;
     {% else %}
     location / {
-        rewrite ^/(.*) https://pythonexpress.in/$1 permanent;
+        rewrite ^/(.*) https://pythonexpress.org/$1 permanent;
     }
     {% endif %}
 }
 
 {% if ssl['on'] %}
 server {
-    include /etc/nginx/sites-available/pythonexpress.in.with_ssl.conf;
+    include /etc/nginx/sites-available/pythonexpress.org.with_ssl.conf;
 
-    server_name pythonexpress.in;
+    server_name pythonexpress.org;
 
     location = /robots.txt {
         return 200 "User-agent: * Disallow:";
     }
 
-    include /etc/nginx/sites-available/pythonexpress.in/*.conf;
+    include /etc/nginx/sites-available/pythonexpress.org/*.conf;
 }
 {% endif %}

…expressin/pythonexpress.in.with_ssl.conf …nexpress/pythonexpress.org.with_ssl.confsalt/roots/pythonexpressin/pythonexpress.in.with_ssl.conf renamed to salt/roots/pythonexpress/pythonexpress.org.with_ssl.conf salt/roots/pythonexpressin/pythonexpress.in.with_ssl.conf renamed to salt/roots/pythonexpress/pythonexpress.org.with_ssl.conf

@@ -1,7 +1,7 @@
 listen 443 ssl;
 
 # deny illegal host headers
-if ($host !~* ^(pythonexpress.in|www.pythonexpress.in)$ ) {
+if ($host !~* ^(pythonexpress.org|www.pythonexpress.org)$ ) {
    return 444;
 }
 
@@ -10,8 +10,8 @@ if ($scheme = http) {
     rewrite ^(.*) https://$server_name$1 permanent;
 }
 
-ssl_certificate /etc/ssl/pythonexpress.in.crt;
-ssl_certificate_key /etc/ssl/pythonexpress.in.key;
+ssl_certificate /etc/letsencrypt/live/pythonexpress.org/fullchain.pem;
+ssl_certificate_key /etc/letsencrypt/live/pythonexpress.org/privkey.pem;
 
 # Recomended settings form
 # https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html

salt/roots/pythonexpressin/beta.pythonexpress.in.conf

@@ -10,10 +10,10 @@ base:
     - inpycon
     - lib/uwsgi_common
     - junction
-  'nodename:pythonexpress.in':
+  'nodename:pythonexpress.org':
     - match: grain
     - lib/uwsgi_common
-    - pythonexpressin
+    - pythonexpress
     - wye
     - mail
     - lib/celery

salt/roots/top.sls

@@ -13,7 +13,7 @@ ADMINS = ({%for name, email in admins.items() %}
        ('{{name}}', '{{email}}'), {% endfor %}
 )
 
-ALLOWED_HOSTS = ['.pythonexpress.in']
+ALLOWED_HOSTS = ['.pythonexpress.org']
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST_USER = '{{ pillar["wye"]["email_host_user"] }}'