Merge branch 'master' into encore

This commit is contained in:
Oliver Davies 2018-03-02 19:40:53 +00:00
commit 1f1d664bcd
3 changed files with 9 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# oliverdavies.uk # oliverdavi.es
Built with [Sculpin][1], styled with [Tailwind CSS][2], deployed with [Ansible][3] and [Ansistrano][4] via [Circle CI][5]. Built with [Sculpin][1], styled with [Tailwind CSS][2], deployed with [Ansible][3] and [Ansistrano][4] via [Circle CI][5].

View file

@ -1,8 +1,12 @@
--- ---
server_name: www.oliverdavies.uk
server_name: www.oliverdavi.es server_name: www.oliverdavi.es
nginx_vhosts: nginx_vhosts:
- listen: 80
server_name: www.oliverdavies.uk
extra_parameters:
return 301 https://{{ server_name }}$request_uri;
- listen: 80 - listen: 80
server_name: "{{ server_name }}" server_name: "{{ server_name }}"
root: "/srv/{{ server_name }}/current/output_prod" root: "/srv/{{ server_name }}/current/output_prod"

View file

@ -1,7 +1,7 @@
--- ---
imports: imports:
- sculpin_site.yml - sculpin_site.yml
url: https://www.oliverdavies.uk url: https://www.oliverdavi.es
images_url: //www.oliverdavies.uk images_url: //www.oliverdavi.es
short_url: oliverdavies.uk short_url: oliverdavi.es
google_analytics_tracking_id: UA-11967257-1 google_analytics_tracking_id: UA-11967257-1