opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove quotes, reorder rewrites

Browse source
This commit is contained in:
Oliver Davies 2018-03-05 00:59:01 +00:00
parent c1109521eb
commit 6305f0c00a
2 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
ansible/vars/vars.yml
View file

@ -14,44 +14,8 @@ nginx_vhosts:
nginx_access_log: "/var/log/nginx/{{ server_name }}_access.log warn"
error_page: 404 /404.html
extra_parameters: |
rewrite "^/about/?$" / permanent;
rewrite "^/consulting/?$" / permanent;
rewrite "^/cv/?$" https://gitprint.com/opdavies/cv/blob/master/README.md permanent;
rewrite "^/drupalgive/?$" https://www.drupal.org/u/opdavies permanent;
rewrite "^/git-flow/?$" /talks/git-flow 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 "^/speaker-info/?$" https://github.com/opdavies/talks/blob/master/speaker-info.md 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/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 "^/terms-and-conditions/?$" /terms permanent;
rewrite '^/talks/deploying-php-applications-with-fabric/?$' /talks/deploying-php-fabric 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 ^/(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;
@ -149,3 +113,39 @@ nginx_vhosts:
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/announcing-the-drupal-vm-generator/?$ /blog/announcing-the-drupal-vm-config-generator permanent;
rewrite ^/consulting/?$ / permanent;
rewrite ^/cv/?$" https://gitprint.com/opdavies/cv/blob/master/README.md permanent;
rewrite ^/drupalgive/?$" https://www.drupal.org/u/opdavies permanent;
rewrite ^/git-flow/?$ /talks/git-flow 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 ^/speaker-info/?$" https://github.com/opdavies/talks/blob/master/speaker-info.md 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;

74
docker/nginx/conf.d/default.conf
View file

@ -3,43 +3,8 @@ server {
error_page 404 /404.html;
rewrite "^/consulting/?$" / permanent;
rewrite "^/cv/?$" https://gitprint.com/opdavies/cv/blob/master/README.md permanent;
rewrite "^/drupalgive/?$" https://www.drupal.org/u/opdavies permanent;
rewrite "^/git-flow/?$" /talks/git-flow 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 "^/speaker-info/?$" https://github.com/opdavies/talks/blob/master/speaker-info.md 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/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 "^/terms-and-conditions/?$" /terms permanent;
rewrite '^/talks/deploying-php-applications-with-fabric/?$' /talks/deploying-php-fabric 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 ^/(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;
@ -141,5 +106,40 @@ server {
rewrite ^/blog/2018/03/04/tweets-from-drupalcamp-london/?$ /blog/tweets-from-drupalcamp-london permanent;
rewrite ^/blog/announcing-the-drupal-vm-generator/?$ /blog/announcing-the-drupal-vm-config-generator permanent;
rewrite ^/blog/install-nomensa-media-player-drupal/?$ /blog/2012/07/nomensa-accessible-media-player-drupal permanent;
rewrite "^/about/?$" / permanent;
rewrite ^/consulting/?$ / permanent;
rewrite ^/cv/?$ https://gitprint.com/opdavies/cv/blob/master/README.md permanent;
rewrite ^/drupalgive/?$ https://www.drupal.org/u/opdavies permanent;
rewrite ^/git-flow/?$ /talks/git-flow 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 ^/speaker-info/?$ https://github.com/opdavies/talks/blob/master/speaker-info.md 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;
}