Skip to content
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

Use files.gravity_tmp as temporary directory for the intermediate lists #5504

Merged
merged 1 commit into from
Dec 9, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 1, 2023

What does this implement/fix?

See title. This PR depends on pi-hole/FTL#1796. This addition is necessary to preserve the ability to change the temporary directory. In v5.0, this was possible via setupVars.conf

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

@DL6ER DL6ER requested a review from a team December 1, 2023 09:28
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/gravity-tmpdir-from-setupvars-conf/66667/2

@yubiuser
Copy link
Member

yubiuser commented Dec 7, 2023

I set the variable to a non existing path and it fails, however, the fallback should kick in

nanopi@nanopi:~$ pihole -g
  Gravity temporary directory does not exist or is not a writeable directory, falling back to /tmp. 
  [i] Creating new gravity database
Error: unable to open database "/etc/pihole/gravity.db
files.gravity_tmp = /tmp/test": unable to open database file
   [✗] Unable to create /etc/pihole/gravity.db
files.gravity_tmp = /tmp/test
   [✗] Error creating new gravity database. Please contact support.
   [✗] Unable to migrate to database. Please contact support.

@DL6ER
Copy link
Member Author

DL6ER commented Dec 8, 2023

@yubiuser This is actually an issue in FTL returning both files.gravity and files.gravity_tmp when requesting files.gravity the last commit in the corresponding FTL PR fixes this.

@DL6ER DL6ER merged commit 03637e9 into development-v6 Dec 9, 2023
14 checks passed
@DL6ER DL6ER deleted the new/files.gravity_tmp branch December 9, 2023 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants