Merge lp:~ted/url-dispatcher/cache-permissions into lp:url-dispatcher/14.04

[Ted Gould]

Fix cache directory permissions if they got messed up

Our cache directory is getting weird permissions, not sure why yet, but this is a work around to fix it for most folks so they can live happy normal url dispatched lives.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/107/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-trusty-amd64-ci/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-trusty-armhf-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-trusty-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/107/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/url-dispatcher/cache-permissions]

51. By Ted Gould on 2014-04-03

Putting in umasks for now

52. By Ted Gould on 2014-04-03

Marking this as 'fixed' for url-dispatcher

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-trusty-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-trusty-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/108/rebuild

review: Approve (continuous-integration)

=== modified file 'data/url-dispatcher-refresh.conf.in'
--- data/url-dispatcher-refresh.conf.in	2014-01-13 19:47:11 +0000
+++ data/url-dispatcher-refresh.conf.in	2014-04-03 19:16:11 +0000
@@ -4,6 +4,12 @@
 
 emits url-dispatcher-update
 
+# Work around for: https://bugs.launchpad.net/upstart/+bug/1302117
+
+umask 0022
+
+# end work around
+
 pre-start script
 # If we're starting with url-dispatcher let's let the rest of the
 # system have a chance to settle.

=== modified file 'data/url-dispatcher-update.conf.in'
--- data/url-dispatcher-update.conf.in	2014-01-13 22:06:01 +0000
+++ data/url-dispatcher-update.conf.in	2014-04-03 19:16:11 +0000
@@ -1,5 +1,11 @@
 description "URL Dispatcher Directory Watch"
 
+# Work around for: https://bugs.launchpad.net/upstart/+bug/1302117
+
+umask 0022
+
+# end work around
+
 start on (file FILE=~/.config/url-dispatcher/urls/*.url-dispatcher) or (file FILE=@datadir@/url-dispatcher/urls/*.url-dispatcher) or url-dispatcher-update
 
 instance $MATCH

=== modified file 'data/url-dispatcher.conf.in'
--- data/url-dispatcher.conf.in	2013-06-27 22:15:58 +0000
+++ data/url-dispatcher.conf.in	2014-04-03 19:16:11 +0000
@@ -6,6 +6,19 @@
 
 respawn
 
+# Work around for: https://bugs.launchpad.net/upstart/+bug/1302117
+
+umask 0022
+
+pre-start script
+	if [ -d "$HOME/.cache/url-dispatcher" ] && [ ! -x "$HOME/.cache/url-dispatcher" ] ; then
+		echo "Fixing cache directory permissions"
+		chmod 700 "$HOME/.cache/url-dispatcher"
+	fi
+end script
+
+# end work around
+
 emits application-start
 
 exec @pkglibexecdir@/url-dispatcher