Skip to content

Commit

Permalink
Allow only one job at a time
Browse files Browse the repository at this point in the history
This should also work around the problem with the about page reporting
the wrong engine version sometimes after an
upgrade (daisy/pipeline-assembly#97) because
system.properties is now always overwritten.
  • Loading branch information
bertfrees committed Mar 18, 2016
1 parent d0a8c95 commit b6d24b8
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
37 changes: 37 additions & 0 deletions roles/test-server/files/opt/daisy-pipeline2/etc/system.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#fwk version
org.daisy.pipeline.version=1.9.11-SNAPSHOT
#misc conf
derby.stream.error.file=/var/log/daisy-pipeline2/derby.log
logback.configurationFile=file:/etc/opt/daisy-pipeline2/config-logback.xml
org.daisy.pipeline.iobase=${org.daisy.pipeline.data}/jobs
org.daisy.pipeline.logdir=/var/log/daisy-pipeline2
#number of parallel workers
org.daisy.pipeline.procs=1
org.daisy.pipeline.xproc.configuration=${org.daisy.pipeline.home}/etc/config-calabash.xml
# org.ops4j.pax.logging.DefaultServiceLog.level=WARN
# org.ops4j.pax.logging.service.frameworkEventsLogLevel=TRACE

# To load AWT in headless mode when running the Braille modules
java.awt.headless=true

#WS configuration
org.daisy.pipeline.ws.host=localhost
#allow local filesystem interaction
#org.daisy.pipeline.ws.localfs=true
#org.daisy.pipeline.ws.authentication=false
#org.daisy.pipeline.ws.authentication.key=clientid
#org.daisy.pipeline.ws.authentication.secret=supersecret

#SSL
#org.daisy.pipeline.ws.ssl=true
#org.daisy.pipeline.ws.ssl.keystore=${org.daisy.pipeline.home}/etc/keystore
#org.daisy.pipeline.ws.ssl.keystorepassword=password
#org.daisy.pipeline.ws.ssl.keypassword=password

#persistence properties
#org.daisy.pipeline.persistence.url=jdbc:mysql://localhost:3306/daisy_pipeline
#org.daisy.pipeline.persistence.user=root
#org.daisy.pipeline.persistence.password=pass

#calabash properties
com.xmlcalabash.config.user=""
3 changes: 3 additions & 0 deletions roles/test-server/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
path: /var/opt/daisy-pipeline2
state: absent
- shell: DEBIAN_FRONTEND=noninteractive dpkg -i /tmp/debs/*.deb
- copy:
src: opt/daisy-pipeline2/etc/system.properties
dest: /opt/daisy-pipeline2/etc/
- service:
name: "{{ item }}"
state: started
Expand Down

0 comments on commit b6d24b8

Please sign in to comment.