Skip to content

Commit ca9dc85

Browse files
committed
move the pythonexpress domain files
1 parent 143b3c5 commit ca9dc85

File tree

7 files changed

+143
-1
lines changed

7 files changed

+143
-1
lines changed

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Vagrant.configure(2) do |config|
2727

2828
config.vm.define "wye" do |machine|
2929
machine.vm.network "forwarded_port", guest: 80, host: 8082
30-
machine.vm.hostname = "pythonexpress.in"
30+
machine.vm.hostname = "pythonexpress.org"
3131
end
3232

3333
config.vm.provision "shell",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
server {
2+
listen 80;
3+
4+
server_name beta.pythonexpress.org www.pythonexpress.org;
5+
location /.well-known/acme-challenge/ {
6+
root /var/www/html/pythonexpress.org/;
7+
}
8+
9+
location / {
10+
rewrite ^/(.*) https://pythonexpress.org/$1 permanent;
11+
}
12+
}

salt/roots/pythonexpress/init.sls

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{% set ssl = pillar['pythonexpress']['ssl'] %}
2+
3+
/var/www/html/pythonexpress.org/:
4+
file.directory
5+
6+
/etc/nginx/sites-available/pythonexpress.org.conf:
7+
file.managed:
8+
- source: salt://pythonexpressin/pythonexpress.org.conf
9+
- template: jinja
10+
- require:
11+
- file: nginx_config_folders
12+
- defaults:
13+
ssl: {{ ssl }}
14+
15+
/etc/nginx/sites-available/beta.pythonexpress.in.conf:
16+
file.managed:
17+
- source: salt://pythonexpressin/beta.pythonexpress.in.conf
18+
- template: jinja
19+
- require:
20+
- file: nginx_config_folders
21+
22+
/etc/nginx/sites-enabled/pythonexpress.org.conf:
23+
file.symlink:
24+
- target: /etc/nginx/sites-available/pythonexpress.org.conf
25+
- require:
26+
- file: /etc/nginx/sites-available/pythonexpress.org.conf
27+
28+
/etc/nginx/sites-enabled/beta.pythonexpress.in.conf:
29+
file.symlink:
30+
- target: /etc/nginx/sites-available/beta.pythonexpress.in.conf
31+
- require:
32+
- file: /etc/nginx/sites-available/beta.pythonexpress.in.conf
33+
34+
nginx_pythonexpress_dir:
35+
file.directory:
36+
- names:
37+
- /etc/nginx/sites-available/pythonexpress.org/
38+
- /etc/nginx/sites-available/pythonexpress.org/upstreams/
39+
- require:
40+
- file: nginx_config_folders
41+
42+
{% if ssl['on'] %}
43+
/etc/ssl/pythonexpress.org.crt:
44+
file.managed:
45+
- contents_pillar: pythonexpress:ssl:cert
46+
47+
/etc/ssl/pythonexpress.org.key:
48+
file.managed:
49+
- contents_pillar: pythonexpress:ssl:key
50+
51+
/etc/nginx/sites-available/pythonexpress.org.with_ssl.conf:
52+
file.managed:
53+
- source: salt://pythonexpressin/pythonexpress.org.with_ssl.conf
54+
55+
{% endif %}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
include /etc/nginx/sites-available/pythonexpress.org/upstreams/*.conf;
2+
3+
proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=old:60m;
4+
server_tokens off;
5+
6+
server {
7+
listen 80;
8+
9+
# deny illegal host headers
10+
if ($host !~* ^(pythonexpress.org|www.pythonexpress.org)$ ) {
11+
return 444;
12+
}
13+
14+
server_name pythonexpress.org;
15+
16+
location /.well-known/acme-challenge/ {
17+
root /var/www/html/pythonexpress.org/;
18+
}
19+
20+
location = /robots.txt {
21+
return 200 "User-agent: * Disallow:";
22+
}
23+
24+
# {% if not ssl['on'] %}
25+
# include /etc/nginx/sites-available/pythonexpress.org/*.conf;
26+
# {% else %}
27+
# location / {
28+
# rewrite ^/(.*) https://pythonexpress.org/$1 permanent;
29+
# }
30+
# {% endif %}
31+
}
32+
33+
{% if ssl['on'] %}
34+
server {
35+
include /etc/nginx/sites-available/pythonexpress.org.with_ssl.conf;
36+
37+
server_name pythonexpress.org;
38+
39+
location = /robots.txt {
40+
return 200 "User-agent: * Disallow:";
41+
}
42+
43+
include /etc/nginx/sites-available/pythonexpress.org/*.conf;
44+
}
45+
{% endif %}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
listen 443 ssl;
2+
3+
# deny illegal host headers
4+
if ($host !~* ^(pythonexpress.org|www.pythonexpress.org)$ ) {
5+
return 444;
6+
}
7+
8+
# force https-redirects
9+
if ($scheme = http) {
10+
rewrite ^(.*) https://$server_name$1 permanent;
11+
}
12+
13+
ssl_certificate /etc/ssl/pythonexpress.org.crt;
14+
ssl_certificate_key /etc/ssl/pythonexpress.org.key;
15+
16+
# Recomended settings form
17+
# https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
18+
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
19+
ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
20+
21+
ssl_prefer_server_ciphers on;
22+
ssl_session_cache shared:SSL:10m;
23+
24+
ssl_stapling on;
25+
ssl_stapling_verify on;
26+
resolver 8.8.4.4 8.8.8.8 valid=300s;
27+
resolver_timeout 10s;
28+
29+
#add_header Strict-Transport-Security max-age=63072000;
30+
add_header X-Content-Type-Options nosniff;
File renamed without changes.

salt/roots/pythonexpressin/pythonexpress.in.with_ssl.conf renamed to salt/roots/pythonexpressin/pythonexpress.org.with_ssl.conf

File renamed without changes.

0 commit comments

Comments
 (0)