diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 54b58626..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: 2
-
-jobs:
- build:
- docker:
- - image: circleci/php:7.1
- steps:
- - checkout
- - restore_cache:
- keys:
- - v1-dependencies-{{ checksum "composer.json" }}
- - v1-dependencies-
- - run: composer install -n --prefer-dist
- - save_cache:
- paths:
- - ./vendor
- key: v1-dependencies-{{ checksum "composer.json" }}
- - run: ./vendor/bin/phpunit --log-junit ~/phpunit/junit.xml
- - store_test_results:
- path: ~/phpunit
- - store_artifacts:
- path: ~/phpunit
-
- deploy:
- docker:
- - image: ansible/ansible:ubuntu1604
- environment:
- ANSIBLE_HOST_KEY_CHECKING: no
- steps:
- - run:
- name: Install system packages.
- command: pip install ansible
- - checkout
- - restore_cache:
- key: v1-{{ .Branch }}-{{ checksum "./ansible/requirements.yml" }}
- - run: ansible-galaxy install -r ansible/requirements.yml
- - save_cache:
- key: v1-{{ .Branch }}-{{ checksum "./ansible/requirements.yml" }}
- paths:
- - '/root/.ansible/roles'
- - run: ansible-playbook ansible/deploy.yml -i ansible/hosts -e 'git_branch=master' -u opdavies --become
-
-workflows:
- version: 2
- build_test_and_deploy:
- jobs:
- - build
- - deploy:
- requires:
- - build
diff --git a/ansible.cfg b/ansible.cfg
deleted file mode 100644
index dc595a71..00000000
--- a/ansible.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[defaults]
-nocows = 1
-retry_files_enabled = False
diff --git a/ansible/deploy.yml b/ansible/deploy.yml
deleted file mode 100644
index 96fa7565..00000000
--- a/ansible/deploy.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- hosts: all
- become: true
-
- vars_files:
- - ./vars/main.yml
-
- vars_prompt:
- - name: git_branch
- prompt: 'Enter a branch to deploy'
- default: master
- private: false
-
- vars:
- ansistrano_deploy_to: "/srv/{{ server_name }}"
- ansistrano_deploy_via: git
- ansistrano_git_repo: https://github.com/opdavies/oliverdavi.es
- ansistrano_git_branch: "{{ git_branch }}"
- ansistrano_keep_releases: 3
- ansistrano_allow_anonymous_stats: false
- ansistrano_after_symlink_shared_tasks_file: "{{ playbook_dir }}/deploy/after-symlink-shared.yml"
- ansistrano_after_symlink_tasks_file: "{{ playbook_dir }}/deploy/after-symlink.yml"
-
- roles:
- - carlosbuenosvinos.ansistrano-deploy
diff --git a/ansible/deploy/after-symlink-shared.yml b/ansible/deploy/after-symlink-shared.yml
deleted file mode 100644
index 679b0830..00000000
--- a/ansible/deploy/after-symlink-shared.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Install Composer dependencies
- composer:
- command: install
- working_dir: "{{ ansistrano_release_path.stdout }}"
-
-- name: Generate the site once without assets
- command: vendor/bin/sculpin generate -e prod
- args:
- chdir: '{{ ansistrano_release_path.stdout }}'
-
-- name: Install Node dependencies
- command: yarn install
- args:
- chdir: '{{ ansistrano_release_path.stdout }}'
-
-- name: Generate assets
- command: yarn build
- args:
- chdir: '{{ ansistrano_release_path.stdout }}'
-
-- name: Generate the site, including assets
- command: ./vendor/bin/sculpin generate -e prod
- args:
- chdir: '{{ ansistrano_release_path.stdout }}'
diff --git a/ansible/deploy/after-symlink.yml b/ansible/deploy/after-symlink.yml
deleted file mode 100644
index eb0e7f15..00000000
--- a/ansible/deploy/after-symlink.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Reload nginx
- service:
- name: nginx
- state: reloaded
diff --git a/ansible/hosts b/ansible/hosts
deleted file mode 100644
index 06dff343..00000000
--- a/ansible/hosts
+++ /dev/null
@@ -1 +0,0 @@
-178.62.3.102
diff --git a/ansible/provision.yml b/ansible/provision.yml
deleted file mode 100644
index c8aa4ea6..00000000
--- a/ansible/provision.yml
+++ /dev/null
@@ -1,220 +0,0 @@
----
-- hosts: all
- become: true
-
- vars_files:
- - ./vars/main.yml
-
- vars:
- certbot_create_if_missing: yes
- certbot_admin_email: 'opdavies+https@gmail.com'
- certbot_certs:
- - domains:
- - oliverdavies.co.uk
- - www.oliverdavies.co.uk
- - domains:
- - oliverdavies.uk
- - www.oliverdavies.uk
- - domains:
- - oliverdavi.es
- - www.oliverdavi.es
-
- nginx_vhosts:
- - listen: 80
- server_name: _
- return: 301 https://{{ server_name }}$request_uri
- filename: oliverdavies.uk.80.conf
-
- - listen: 443 ssl
- server_name: oliverdavies.co.uk www.oliverdavies.co.uk
- extra_parameters: |
- ssl_certificate /etc/letsencrypt/live/oliverdavies.co.uk/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/oliverdavies.co.uk/privkey.pem;
- ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.co.uk/fullchain.pem;
- return: 301 https://{{ server_name }}$request_uri
- filename: oliverdavies.co.uk.443.conf
-
- - listen: 443 ssl
- server_name: oliverdavi.es www.oliverdavi.es
- extra_parameters: |
- ssl_certificate /etc/letsencrypt/live/oliverdavi.es/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/oliverdavi.es/privkey.pem;
- ssl_trusted_certificate /etc/letsencrypt/live/oliverdavi.es/fullchain.pem;
- return: 301 https://{{ server_name }}$request_uri
- filename: oliverdavi.es.443.conf
-
- - listen: 443 ssl
- server_name: oliverdavies.uk
- extra_parameters: |
- ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
- ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
- return: 301 https://{{ server_name }}$request_uri
- filename: oliverdavies.uk.443.conf
-
- - listen: 443 ssl
- server_name: '{{ server_name }}'
- root: '/srv/{{ server_name }}/{{ ansistrano_current_dir }}/output_prod'
- nginx_error_log: '/var/log/nginx/{{ server_name }}_error.log warn'
- nginx_access_log: '/var/log/nginx/{{ server_name }}_access.log warn'
- error_page: 404 /404.html
- extra_parameters: |
- ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
- ssl_trusted_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
-
- rewrite ^/(services|work)/?$ /experience permanent;
- rewrite ^/about/?$ / permanent;
- rewrite ^/blog/2010/04/05/style-drupal-6s-taxonomy-lists-php-css-and-jquery/?$ /blog/style-drupal-6s-taxonomy-lists-php-css-and-jquery permanent;
- rewrite ^/blog/2010/04/28/using-imagecache-and-imagecrop-my-portfolio/?$ /blog/using-imagecache-and-imagecrop-my-portfolio permanent;
- rewrite ^/blog/2010/05/06/conditional-email-addresses-webform/?$ /blog/conditional-email-addresses-webform permanent;
- rewrite ^/blog/2010/05/10/quickly-create-zen-subthemes-using-zenophile/?$ /blog/quickly-create-zen-subthemes-using-zenophile permanent;
- rewrite ^/blog/2010/05/25/create-slideshow-multiple-images-using-fancy-slide/?$ /blog/create-slideshow-multiple-images-using-fancy-slide permanent;
- rewrite ^/blog/2010/05/29/quickly-import-multiples-images-using-imagefieldimport-module/?$ /blog/quickly-import-multiples-images-using-imagefieldimport-module permanent;
- rewrite ^/blog/2010/06/02/improve-jpg-quality-imagecache-and-imageapi/?$ /blog/improve-jpg-quality-imagecache-and-imageapi permanent;
- rewrite ^/blog/2010/06/23/create-block-social-media-icons-using-cck-views-and-nodequeue/?$ /blog/create-block-social-media-icons-using-cck-views-and-nodequeue permanent;
- rewrite ^/blog/2010/06/25/10-useful-drupal-6-modules/?$ /blog/10-useful-drupal-6-modules permanent;
- rewrite ^/blog/2010/06/28/create-flickr-photo-gallery-using-feeds-cck-and-views/?$ /blog/create-flickr-photo-gallery-using-feeds-cck-and-views permanent;
- rewrite ^/blog/2010/07/01/change-content-type-multiple-nodes-using-sql/?$ /blog/change-content-type-multiple-nodes-using-sql permanent;
- rewrite ^/blog/2010/07/02/create-virtual-hosts-mac-os-x-using-virtualhostx/?$ /blog/create-virtual-hosts-mac-os-x-using-virtualhostx permanent;
- rewrite ^/blog/2010/07/07/add-taxonomy-term-multiple-nodes-using-sql/?$ /blog/add-taxonomy-term-multiple-nodes-using-sql permanent;
- rewrite ^/blog/2010/07/12/review-teleport-module/?$ /blog/review-teleport-module permanent;
- rewrite ^/blog/2010/08/10/review-adminhover-module/?$ /blog/review-adminhover-module permanent;
- rewrite ^/blog/2010/08/11/create-better-photo-gallery-drupal-part-1/?$ /blog/create-better-photo-gallery-drupal-part-1 permanent;
- rewrite ^/blog/2010/08/17/create-better-photo-gallery-drupal-part-2/?$ /blog/create-better-photo-gallery-drupal-part-2 permanent;
- rewrite ^/blog/2010/08/20/review-image-caption-module/?$ /blog/review-image-caption-module permanent;
- rewrite ^/blog/2010/09/26/south-wales-drupal-user-group/?$ /blog/south-wales-drupal-user-group permanent;
- rewrite ^/blog/2010/10/10/create-and-apply-patches/?$ /blog/create-and-apply-patches permanent;
- rewrite ^/blog/2010/10/13/create-better-photo-gallery-drupal-part-3/?$ /blog/create-better-photo-gallery-drupal-part-3 permanent;
- rewrite ^/blog/2010/10/22/create-better-photo-gallery-drupal-part-21/?$ /blog/create-better-photo-gallery-drupal-part-21 permanent;
- rewrite ^/blog/2010/11/04/use-regular-expressions-search-and-replace-coda-or-textmate/?$ /blog/use-regular-expressions-search-and-replace-coda-or-textmate permanent;
- rewrite ^/blog/2011/02/14/easily-embed-typekit-fonts-your-drupal-website/?$ /blog/easily-embed-typekit-fonts-your-drupal-website permanent;
- rewrite ^/blog/2011/03/15/display-number-facebook-fans-php/?$ /blog/display-number-facebook-fans-php permanent;
- rewrite ^/blog/2011/03/31/proctor-stevenson/?$ /blog/proctor-stevenson permanent;
- rewrite ^/blog/2011/05/20/proctors-hosting-next-drupal-meetup/?$ /blog/proctors-hosting-next-drupal-meetup permanent;
- rewrite ^/blog/2011/05/23/imagefield-import-archive/?$ /blog/imagefield-import-archive permanent;
- rewrite ^/blog/2011/08/28/create-multigroups-drupal-7-using-field-collections/?$ /blog/create-multigroups-drupal-7-using-field-collections permanent;
- rewrite ^/blog/2011/10/19/install-and-configure-subversion-svn-server-ubuntu/?$ /blog/install-and-configure-subversion-svn-server-ubuntu permanent;
- rewrite ^/blog/2012/01/04/site-upgraded-drupal-7/?$ /blog/site-upgraded-drupal-7 permanent;
- rewrite ^/blog/2012/02/01/use-authorized-keys-create-passwordless-ssh-connection/?$ /blog/use-authorized-keys-create-passwordless-ssh-connection permanent;
- rewrite ^/blog/2012/04/16/create-omega-subtheme-less-css-preprocessor-using-omega-tools-and-drush/?$ /blog/create-omega-subtheme-less-css-preprocessor-using-omega-tools-and-drush permanent;
- rewrite ^/blog/2012/04/17/installing-nagios-centos/?$ /blog/installing-nagios-centos permanent;
- rewrite ^/blog/2012/04/19/adding-custom-theme-templates-drupal-7/?$ /blog/adding-custom-theme-templates-drupal-7 permanent;
- rewrite ^/blog/2012/05/23/add-date-popup-calendar-custom-form/?$ /blog/add-date-popup-calendar-custom-form permanent;
- rewrite ^/blog/2012/05/23/checkout-specific-revision-svn-command-line/?$ /blog/checkout-specific-revision-svn-command-line permanent;
- rewrite ^/blog/2012/05/23/forward-one-domain-another-using-mod-rewrite-and-htaccess/?$ /blog/forward-one-domain-another-using-mod-rewrite-and-htaccess permanent;
- rewrite ^/blog/2012/05/23/prevent-apache-displaying-text-files-within-web-browser/?$ /blog/prevent-apache-displaying-text-files-within-web-browser permanent;
- rewrite ^/blog/2012/05/23/writing-info-file-drupal-7-theme/?$ /blog/writing-info-file-drupal-7-theme permanent;
- rewrite ^/blog/2012/05/24/dividing-drupals-process-and-preprocess-functions-separate-files/?$ /blog/dividing-drupals-process-and-preprocess-functions-separate-files permanent;
- rewrite ^/blog/2012/07/12/my-new-drupal-modules/?$ /blog/my-new-drupal-modules permanent;
- rewrite ^/blog/2012/07/14/install-nomensa-media-player-drupal/?$ /blog/install-nomensa-media-player-drupal permanent;
- rewrite ^/blog/2012/07/27/writing-article-linux-journal/?$ /blog/writing-article-linux-journal permanent;
- rewrite ^/blog/2012/08/18/display-custom-menu-drupal-7-theme-template-file/?$ /blog/display-custom-menu-drupal-7-theme-template-file permanent;
- rewrite ^/blog/2012/09/06/reflections-speaking-unifieddiff/?$ /blog/reflections-speaking-unifieddiff permanent;
- rewrite ^/blog/2012/10/25/my-sublime-text-2-settings/?$ /blog/my-sublime-text-2-settings permanent;
- rewrite ^/blog/2012/11/15/accessible-bristol-site-launched/?$ /blog/accessible-bristol-site-launched permanent;
- rewrite ^/blog/2012/11/17/open-sublime-text-2-mac-os-x-command-line/?$ /blog/open-sublime-text-2-mac-os-x-command-line permanent;
- rewrite ^/blog/2012/12/06/use-sass-and-compass-drupal-7-using-sassy/?$ /blog/use-sass-and-compass-drupal-7-using-sassy permanent;
- rewrite ^/blog/2013/01/09/checking-if-user-logged-drupal-right-way/?$ /blog/checking-if-user-logged-drupal-right-way permanent;
- rewrite ^/blog/2013/02/16/creating-and-using-custom-tokens-drupal-7/?$ /blog/creating-and-using-custom-tokens-drupal-7 permanent;
- rewrite ^/blog/2013/03/02/quickest-way-install-sublime-text-2-ubuntu/?$ /blog/quickest-way-install-sublime-text-2-ubuntu permanent;
- rewrite ^/blog/2013/04/20/leaving-nomensa-joining-precedent/?$ /blog/leaving-nomensa-joining-precedent permanent;
- rewrite ^/blog/2013/04/27/display-git-branch-or-tag-names-your-bash-prompt/?$ /blog/display-git-branch-or-tag-names-your-bash-prompt permanent;
- rewrite ^/blog/2013/06/13/some-useful-links-using-simpletest-drupal/?$ /blog/some-useful-links-using-simpletest-drupal permanent;
- rewrite ^/blog/2013/07/17/creating-local-and-staging-sites-drupals-domain-module-enabled/?$ /blog/creating-local-and-staging-sites-drupals-domain-module-enabled permanent;
- rewrite ^/blog/2013/07/26/going-drupalcon/?$ /blog/going-drupalcon permanent;
- rewrite ^/blog/2013/09/06/create-a-zen-sub-theme-using-drush/?$ /blog/create-a-zen-sub-theme-using-drush permanent;
- rewrite ^/blog/2013/11/19/dont-bootstrap-drupal-use-drush/?$ /blog/dont-bootstrap-drupal-use-drush permanent;
- rewrite ^/blog/2013/11/27/useful-vagrant-commands/?$ /blog/useful-vagrant-commands permanent;
- rewrite ^/blog/2013/12/24/quickly-apply-patches-using-git-and-curl-or-wget/?$ /blog/quickly-apply-patches-using-git-and-curl-or-wget permanent;
- rewrite ^/blog/2013/12/31/download-different-versions-drupal-drush/?$ /blog/download-different-versions-drupal-drush permanent;
- rewrite ^/blog/2014/01/15/some-useful-git-aliases/?$ /blog/some-useful-git-aliases permanent;
- rewrite ^/blog/2014/02/09/drupalcamp-london-2014/?$ /blog/drupalcamp-london-2014 permanent;
- rewrite ^/blog/2014/03/03/what-git-flow/?$ /blog/what-git-flow permanent;
- rewrite ^/blog/2014/05/03/drupal-association/?$ /blog/drupal-association permanent;
- rewrite ^/blog/2014/05/06/thanks/?$ /blog/thanks permanent;
- rewrite ^/blog/2014/05/21/git-format-patch/?$ /blog/git-format-patch permanent;
- rewrite ^/blog/2014/07/02/drush-make-drupalbristol/?$ /blog/drush-make-drupalbristol permanent;
- rewrite ^/blog/2014/10/06/fix-vagrant-loading-wrong-virtual-machine/?$ /blog/fix-vagrant-loading-wrong-virtual-machine permanent;
- rewrite ^/blog/2014/10/21/updating-features-and-adding-components-using-drush/?$ /blog/updating-features-and-adding-components-using-drush permanent;
- rewrite ^/blog/2014/11/18/include-css-fonts-using-sass-each-loop/?$ /blog/include-css-fonts-using-sass-each-loop permanent;
- rewrite ^/blog/2014/11/20/using-remote-files-when-developing-locally-with-stage-file-proxy-module/?$ /blog/using-remote-files-when-developing-locally-with-stage-file-proxy-module permanent;
- rewrite ^/blog/2014/11/27/pantheon-settings-files/?$ /blog/pantheon-settings-files permanent;
- rewrite ^/blog/2014/12/20/include-local-drupal-settings-file-environment-configuration-and-overrides/?$ /blog/include-local-drupal-settings-file-environment-configuration-and-overrides permanent;
- rewrite ^/blog/2015/04/03/how-to-define-a-minimum-drupal-core-version/?$ /blog/how-to-define-a-minimum-drupal-core-version permanent;
- rewrite ^/blog/2015/06/18/updating-forked-repositories-on-github/?$ /blog/updating-forked-repositories-on-github permanent;
- rewrite ^/blog/2015/07/19/sculpin-twig-resources/?$ /blog/sculpin-twig-resources permanent;
- rewrite ^/blog/2015/07/21/automating-sculpin-jenkins/?$ /blog/automating-sculpin-jenkins permanent;
- rewrite ^/blog/2015/12/22/programmatically-load-an-entityform-in-drupal-7/?$ /blog/programmatically-load-an-entityform-in-drupal-7 permanent;
- rewrite ^/blog/2016/02/15/announcing-the-drupal-vm-generator/?$ /blog/announcing-the-drupal-vm-generator permanent;
- rewrite ^/blog/2016/05/03/simplifying-drupal-migrations-with-xautoload/?$ /blog/simplifying-drupal-migrations-with-xautoload permanent;
- rewrite ^/blog/2016/07/15/building-gmail-filters-with-php/?$ /blog/building-gmail-filters-with-php permanent;
- rewrite ^/blog/2016/12/30/drupal-vm-generator-291-released/?$ /blog/drupal-vm-generator-291-released permanent;
- rewrite ^/blog/2017/01/07/easier-sculpin-commands-with-composer-and-npm-scripts/?$ /blog/easier-sculpin-commands-with-composer-and-npm-scripts permanent;
- rewrite ^/blog/2017/01/31/nginx-redirects-with-query-string-arguments/?$ /blog/nginx-redirects-with-query-string-arguments permanent;
- rewrite ^/blog/2017/05/05/fixing-drupal-simpletest-docker/?$ /blog/2017/05/05/fixing-drupal-simpletest-issues-inside-docker-containers permanent;
- rewrite ^/blog/2017/05/05/fixing-drupal-simpletest-issues-inside-docker-containers/?$ /blog/fixing-drupal-simpletest-issues-inside-docker-containers permanent;
- rewrite ^/blog/2017/06/09/introducing-the-drupal-meetups-twitterbot/?$ /blog/introducing-the-drupal-meetups-twitterbot permanent;
- rewrite ^/blog/2017/11/07/tdd-test-driven-drupal/?$ /blog/tdd-test-driven-drupal permanent;
- rewrite ^/blog/2017/11/07/writing-drupal-module-test-driven-development-tdd/?$ /blog/2017/11/07/tdd-test-driven-drupal permanent;
- rewrite ^/blog/2018/01/30/drupalcamp-bristol-2018/?$ /blog/drupalcamp-bristol-2018 permanent;
- rewrite ^/blog/2018/02/05/using-tailwind-css-in-your-drupal-theme/?$ /blog/using-tailwind-css-in-your-drupal-theme permanent;
- rewrite ^/blog/2018/02/27/looking-forward-to-drupalcamp-london/?$ /blog/looking-forward-to-drupalcamp-london permanent;
- rewrite ^/blog/2018/02/27/queuing-private-messages-in-drupal-8/?$ /blog/queuing-private-messages-in-drupal-8 permanent;
- rewrite ^/blog/2018/02/28/building-the-new-phpsw-website/?$ /blog/building-the-new-phpsw-website permanent;
- rewrite ^/blog/2018/03/02/yay-the-mediacurrent-contrib-half-hour-is-back/?$ /blog/yay-the-mediacurrent-contrib-half-hour-is-back permanent;
- rewrite ^/blog/2018/03/04/tweets-from-drupalcamp-london/?$ /blog/tweets-from-drupalcamp-london permanent;
- rewrite ^/blog/2018/05/06/creating-a-custom-phpunit-command-for-docksal/?$ /blog/creating-a-custom-phpunit-command-for-docksal permanent;
- rewrite ^/blog/announcing-the-drupal-vm-generator/?$ /blog/announcing-the-drupal-vm-config-generator permanent;
- rewrite ^/blog/drush-make-drupalbristol/?$ /talks/drush-make-drupalbristol permanent;
- rewrite ^/book/?$ /test-driven-drupal permanent;
- rewrite ^/consulting/?$ / permanent;
- rewrite ^/cv/?$ https://gitprint.com/opdavies/cv/blob/master/README.md permanent;
- rewrite ^/drupal/?$ https://www.drupal.org/u/opdavies permanent;
- rewrite ^/drupalgive/?$ https://www.drupal.org/u/opdavies permanent;
- rewrite ^/git-flow/?$ /talks/git-flow permanent;
- rewrite ^/github/?$ https://github.com/opdavies permanent;
- rewrite ^/joindin/?$ https://joind.in/user/opdavies permanent;
- rewrite ^/linkedin/?$ https://www.linkedin.com/in/opdavies permanent;
- rewrite ^/packagist/?$ https://packagist.org/packages/opdavies permanent;
- rewrite ^/slides/bristol-dug/drupal-vm-generator/?$ http://opdavies.github.io/slides-drupal-vm-generator permanent;
- rewrite ^/slides/phpsw/building-static-websites-with-sculpin/?$ https://opdavies.github.io/slides-phpsw-sculpin permanent;
- rewrite ^/speakerdeck/?$ https://speakerdeck.com/opdavies permanent;
- rewrite ^/speaking/?$ /talks permanent;
- rewrite ^/talks/2012/09/05/what-is-this-drupal-thing-unified-diff/?$ /talks/what-is-this-drupal-thing permanent;
- rewrite ^/talks/2013/07/10/drupal-ldap-swdug/?$ /talks/drupal-ldap permanent;
- rewrite ^/talks/2014/03/01/git-flow-drupalcamp-london-2014/?$ /talks/git-flow permanent;
- rewrite ^/talks/2014/07/02/drush-make-drupalbristol-drupal-bristol/?$ /talks/drush-make-drupalbristol permanent;
- rewrite ^/talks/2014/08/19/drupal-association-swdug/?$ /talks/drupal-association permanent;
- rewrite ^/talks/2015/01/18/drupalorg-2015-drupalcamp-brighton-2015/?$ /talks/drupalorg-in-2015-whats-coming-next permanent;
- rewrite ^/talks/2015/02/28/drupalorg-2015-drupalcamp-london-2015/?$ /talks/drupalorg-in-2015-whats-coming-next permanent;
- rewrite ^/talks/2015/04/08/drupal-8-phpsw/?$ /talks/drupal-8 permanent;
- rewrite ^/talks/2015/07/25/test-drive-twig-with-sculpin-drupalcamp-north-2015/?$ /talks/test-drive-twig-with-sculpin permanent;
- rewrite ^/talks/2015/08/25/dancing-for-drupal-umbristol/?$ /talks/dancing-for-drupal permanent;
- rewrite ^/talks/2015/10/14/sculpin-phpsw/?$ /talks/sculpin permanent;
- rewrite ^/talks/2016/03/05/drupal-8-module-development-drupalcamp-london-2016/?$ /talks/getting-started-with-drupal-8-module-development permanent;
- rewrite ^/talks/2016/03/09/drupal-vm-generator-nwdug/?$ /talks/drupal-vm-generator permanent;
- rewrite ^/talks/2016/04/02/drupal-vm-generator-drupal-bristol/?$ /talks/drupal-vm-generator permanent;
- rewrite ^/talks/2016/06/11/drupal-8-rejoining-the-herd-php-south-coast-2016/?$ /talks/drupal-8-rejoining-the-herd permanent;
- rewrite ^/talks/2016/07/23/drupal-vm-meet-symfony-console-drupalcamp-bristol-2016/?$ /talks/drupal-vm-meet-symfony-console permanent;
- rewrite ^/talks/2016/11/09/drupal-development-with-composer-phpsw/?$ /talks/drupal-development-with-composer permanent;
- rewrite ^/talks/2016/11/17/goodbye-drush-make-hello-composer-drupal-bristol/?$ /talks/goodbye-drush-make-hello-composer permanent;
- rewrite ^/talks/2017/01/18/getting-your-data-into-drupal-8-drupal-bristol/?$ /talks/getting-your-data-into-drupal-8 permanent;
- rewrite ^/talks/2017/03/04/getting-your-data-into-drupal-8-drupalcamp-london-2017/?$ /talks/getting-your-data-into-drupal-8 permanent;
- rewrite ^/talks/archive/?$ /talks permanent;
- rewrite ^/talks/deploying-php-applications-with-fabric/?$ /talks/deploying-php-fabric permanent;
- rewrite ^/talks/drupal-vm-generator-2/?$ /talks/drupal-vm-generator permanent;
- rewrite ^/talks/drupalorg-2015-2/?$ /talks/drupalorg-2015 permanent;
- rewrite ^/talks/drupalorg-in-2015-whats-coming-next/?$ /talks/drupalorg-2015 permanent;
- rewrite ^/talks/getting-started-with-drupal-8-module-development/?$ /drupal-8-module-development permanent;
- rewrite ^/talks/sculpin/?$ /talks/building-static-websites-sculpin permanent;
- rewrite ^/terms-and-conditions/?$ /terms permanent;
- rewrite ^/twitter/?$ https://twitter.com/opdavies permanent;
- rewrite ^/youtube/?$ https://www.youtube.com/channel/UC5QoKapQ4bXOVMvN_ng_TYw permanent;
- filename: www.oliverdavies.uk.443.conf
-
- roles:
- - name: geerlingguy.certbot
- tags: ['certbot']
- - name: geerlingguy.nginx
- tags: ['nginx']
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
deleted file mode 100644
index 6360a203..00000000
--- a/ansible/requirements.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- src: carlosbuenosvinos.ansistrano-deploy
- version: 2.2.0
-
-- src: geerlingguy.certbot
- version: 3.0.0
-
-- src: geerlingguy.nginx
- version: 2.5.0
diff --git a/ansible/vars/main.yml b/ansible/vars/main.yml
deleted file mode 100644
index addf8134..00000000
--- a/ansible/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-server_name: www.oliverdavies.uk
-ansistrano_current_dir: current