jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348132 )
Change subject: Use defaults that will play nicer with the .deb
......................................................................
Use defaults that will play nicer with the .deb
Change-Id: Iaea842d142ac3c859209f3ae610c669789af16a6
---
M Makefile
M examples/process-control.example.yaml
2 files changed, 5 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/Makefile b/Makefile
index 8b833ea..21c7ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@
deb: debian
@echo Note that this is not how we build our production .deb
# FIXME: fragile
- cd ..; tar cjf process-control_1.0.5.orig.tar.bz2 process-control; cd
process-control
+ cd ..; tar cjf process-control_1.0.6.orig.tar.bz2 process-control; cd
process-control
debuild -us -uc
debian:
diff --git a/examples/process-control.example.yaml
b/examples/process-control.example.yaml
index 2f43e63..7a4f833 100644
--- a/examples/process-control.example.yaml
+++ b/examples/process-control.example.yaml
@@ -11,14 +11,14 @@
# Enforce that jobs are run as this service user.
# FIXME: new service user for this package.
-user: jenkins
+user: process-control
# Default values used when the job description doesn't have these keys. See
# the README for a discussion of how to configure jobs.
default_job_config:
failmail:
- from_address: "Fail Mail <[email protected]>"
- to_address: "[email protected]"
+ from_address: "process-control@localhost"
+ to_address: "root@localhost"
# Make the default timeout ten minutes. If this line is removed, jobs will
# have unlimited time to run.
@@ -75,11 +75,6 @@
# Path for working files such as locks.
#
-# TODO: The deb install should create this directory and do something about
-# permissions.
-# TODO: rename to `lock_directory`
-#run_directory: /var/run/process-control
-#
-run_directory: /tmp
+run_directory: /var/run/process-control
state_directory: /var/cache/process-control
--
To view, visit https://gerrit.wikimedia.org/r/348132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaea842d142ac3c859209f3ae610c669789af16a6
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
