Put the JSON file in /var/www by default (#10)
By popular request! Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
06dddceca4
commit
6bd1b85732
3 changed files with 3 additions and 3 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
This tool generates JSON and HTML data on Fedora nightly compose images. For each image, it tracks successful composes and - if openQA or Autocloud tests the image - whether it passed all tests. It stores details of failed tests, and the HTML output includes links to them. The HTML file is intended to be served for users to be able to conveniently locate the most recent successful and/or tested compose of a given image for Rawhide and Branched.
|
||||
|
||||
`/var/lib/fedora_nightlies` and `/var/www/fedora_nightlies` must exist and allow the user running the tool to read and create files. The JSON file is `/var/lib/fedora_nightlies/nightlies.json`, and the HTML file is `/var/www/fedora_nightlies/nightlies.html`; these also must be readable and writeable by the user running the tool. You are expected to configure some kind of web server to serve out `nightlies.html`, so it must be allowed to read that file.
|
||||
`/var/www/fedora_nightlies` must exist and allow the user running the tool to read and create files. The JSON file is `/var/www/fedora_nightlies/nightlies.json`, and the HTML file is `/var/www/fedora_nightlies/nightlies.html`; these also must be readable and writeable by the user running the tool. You are expected to configure some kind of web server to serve out `nightlies.html` (and optionally the JSON file also), so it must be allowed to read it/them.
|
||||
|
||||
To initialize the data, run the script directly (or as `fedora_nightlies` after doing `python setup.py install`). To use the fedora-messaging consumer which updates the data automatically whenever a compose appears or testing for one completes, ensure `fedora-messaging` is installed, run `python setup.py install`, copy `fedora_nightlies.toml` to `/etc/fedora-messaging` and adjust it as necessary (at least change the queue name), and enable and start the systemd service:
|
||||
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ class Nightlies(object):
|
|||
self.datafile = datafile
|
||||
self.htmlfile = htmlfile
|
||||
if not self.datafile:
|
||||
self.datafile = '/var/lib/fedora_nightlies/nightlies.json'
|
||||
self.datafile = '/var/www/fedora_nightlies/nightlies.json'
|
||||
if not self.htmlfile:
|
||||
self.htmlfile = '/var/www/fedora_nightlies/nightlies.html'
|
||||
logger.debug("Data file: %s", self.datafile)
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ routing_keys = ["org.fedoraproject.prod.openqa.job.done",
|
|||
|
||||
[consumer_config]
|
||||
# JSON data file location. If not set, default
|
||||
# /var/lib/fedora_nightlies/nightlies.json will be used
|
||||
# /var/www/fedora_nightlies/nightlies.json will be used
|
||||
#datafile = "/tmp/nightlies.json"
|
||||
# HTML output file location. If not set, default
|
||||
# /var/www/fedora_nightlies/nightlies.html will be used
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue