-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
aqd.conf.noms: update inappropriate defaults #79
Conversation
etc/aqd.conf.noms
Outdated
dbname = aquilon | ||
|
||
[database_sqlite] | ||
dbfile = /pdisk/aquilon/db/aquilon.db |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe it should be relative path to quattordir as in default conf?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@urbonegi sure, you are perfectly right! A too quick copy/paste.
etc/aqd.conf.noms
Outdated
dbname = aquilon | ||
|
||
[database_sqlite] | ||
dbfile = %(basedir)s/aquilon/db/aquilon.db |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just double checking. So if you would just skip this section the dbfile would be this:
dbfile = %(quattordir)s/aquilondb/aquilon.db
Should this be different really :) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@urbonegi I apologize for this serie of mistakes. You are perfectly right: it should be quattordir
. I'd suggest to keep it here despite this is the default to better expose it, as this is one option that a site may want to modify. But if you prefer the other way around, I will not insist!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this is a file for community rather than MS, i do not mind. Just not sure if having a ‘db’ subdirectory in ‘aquilon’ directory was intentional or a typo that turned ‘aquilondb’ into to ‘aquilon/db’ by accident?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your eyes. Clearly another mistake I didn't spot!
d82428a
to
8ff8f3d
Compare
Great! @xaf just noticed that all the commits missing the change-id.. Please add it cause if we will be adding it ourselves this will change commitid of the commits. Instructions here:https://www.quattor.org/aquilon/00-install.html#contributing |
Sure, I'll add it. Also not that I'm changing the |
Should be ok now! (i'll fix the missing |
@jouvin could you update the commit message to remove the extra 's' please ? |
- Fix wrong ant_home: define as /usr/share/ant instead of the empty string - Enable management of git-daemon by the broker - Set panc output format to json - Add Postgres database name Fixes quattor#78 Change-Id: Ibf218a69dd149cfe63d6af20c406000b524ed028
@Shaeli Sorry for the typo. Should be ok now. |
merge: 3eef77c |
…merge/master/by_topic/barnesf_disk_parameters to master * commit '969ca7f9bd25839fab07e75ad4bf0b638f6c4d48': Add new fields to Disk object
Fixes #78
Fixes #82