Changing DB location for Homu #476
Conversation
homu/files/cfg.toml
Outdated
| @@ -167,3 +167,7 @@ context = 'continuous-integration/appveyor/branch' | |||
|
|
|||
| [repo.rust-mozjs.status.appveyor] | |||
| context = 'continuous-integration/appveyor/branch' | |||
|
|
|||
| # The database homu uses | |||
|
Please configure your editor to ensure files are saved with a trailing newline. |
homu/init.sls
Outdated
|
|
||
| /var/homu: | ||
| file.directory: | ||
| - source: salt://{{ tpldir }}/var/homu |
There was a problem hiding this comment.
We just want the directory to exist, so no need for a source since we're not filling it with anything.
|
Thanks for the PR, @Coder206! |
|
Reminder to self: demonstrate the |
|
@aneeshusa I made the changes you requested except for adding a template for Salt, I was unsure how to do it. |
homu/files/cfg.toml
Outdated
| @@ -167,3 +167,6 @@ context = 'continuous-integration/appveyor/branch' | |||
|
|
|||
| [repo.rust-mozjs.status.appveyor] | |||
| context = 'continuous-integration/appveyor/branch' | |||
|
|
|||
| [db] | |||
| file = "/var/homu/main.db" | |||
There was a problem hiding this comment.
@aneeshusa Is this correction related to your self-reminder?
|
@Coder206 Let me know if you want some more tips before trying to get the templating working again (everything else looks good). If you don't feel comfortable with it, do you mind giving me push access to your branch (https://github.com/blog/2247-improving-collaboration-with-forks)? I can push some commits on top of your branch to show you how it's done, which may be easier than explaining. (Also, if you want to do this, please squash your commits beforehand.) |
|
@aneeshusa Yes (I am not very comfortable with doing the template of Salt), I would like a demonstration, give me a minute to send the new changes. I already allowed edits from maintainers. |
homu/init.sls
Outdated
|
|
||
| /var/homu: | ||
| file.directory: | ||
| - template: jinja |
There was a problem hiding this comment.
Remove this, as file.directory can't be templated (there's no content).
|
Looking good so far. Please squash these into one commit and I will add new commits to this branch to demonstrate templating. |
|
@Coder206 sorry about the review delay on this one, our infra has been a bit crazy recently so I'll get to this in a bit when its more quiet. |
|
☔ The latest upstream changes (presumably #610) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@Coder206 Please remove the merge commit. |
|
Hi @Coder206, I've added a commit implementing Salt templating. Please rebase this on top of master and squash the commits! |
|
@aneeshusa Sorry for the delays, rebased! Thanks for your help :) |
aneeshusa
added
S-needs-code-changes
and removed
S-awaiting-review
S-needs-rebase
labels
Coder206
force-pushed
the
homuDB
branch
4 times, most recently
from
d56a5b4
to
16ef531
Compare
|
@aneeshusa I made a |
|
@aneeeshua Should I rebase with your changes? |
|
@Coder206 It looks like you dropped the commit I added, I pushed it to your branch again. Please squash again: |
This makes it harder to accidentally delete the database.
|
@aneeshusa Should I force push the squashed commit? |
|
@Coder206 yes please, I forgot to list that step! I'm also on IRC if you need more git help |
|
Looks great @Coder206, thanks for this! @bors-servo r+ |
|
📌 Commit 656ed2b has been approved by |
Changing DB location for Homu Here is some code that attempts to solve #456. cc @aneeshusa <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/476) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
|
FYI @larsbergstrom @metajack @edunham (and anyone else who deploys), this requires manual intervention when deploying to move the Homu database to the new location. |
|
I believe that this got deployed, as I had to manually |
Here is some code that attempts to solve #456.
cc @aneeshusa
This change is