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

Improvements for Teleporter #1276

Merged
merged 8 commits into from
May 12, 2020
Merged

Improvements for Teleporter #1276

merged 8 commits into from
May 12, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 12, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

Even our extensive beta phase didn't reveal a few issues with Teleporter. They will be fixed in this PR. Changes:

  • Add export & import for missing tables: group, client + the group linking tables.
  • Rename Teleporter Ex-/Import to Backup and Restore to highlight that they are meant for being done on one and the same device rather than for transporting stuff between different installations (even when this is and will stay possible).
  • Add pihole-FTL.conf ans custom.list (Local DNS Records) to Teleporter Backup
  • Add import for Local DNS Records
  • Improve arrangement of check boxes in the Teleporter Import box
  • Log number of imported group assignments

DL6ER added 7 commits May 12, 2020 20:23
…they are meant for being done on one and the same device rather than for transporting stuff between different installations (even when this is and will stay possible).

Signed-off-by: DL6ER <dl6er@dl6er.de>
… Backup

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added this to the v5.1 milestone May 12, 2020
@DL6ER DL6ER requested a review from a team May 12, 2020 18:39
@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/ability-to-export-import-local-dns-configuration-via-teleporter/27932/18

@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/add-pihole-ftl-conf-to-teleporter/31486/3

scripts/pi-hole/php/teleporter.php Show resolved Hide resolved
settings.php Outdated Show resolved Hide resolved
scripts/pi-hole/php/customdns.php Outdated Show resolved Hide resolved
Signed-off-by: DL6ER <dl6er@dl6er.de>
@dschaper
Copy link
Member

We'll need to note in the Release Notes that "Teleporter" is now just Backup/Restore.

@DL6ER DL6ER merged commit fa2a31c into devel May 12, 2020
@DL6ER DL6ER deleted the fix/teleporter branch May 12, 2020 19:47
@yubiuser
Copy link
Member

yubiuser commented May 13, 2020

I see a small glitch: a break is missing in front of the checkbox for "Local DNS Records"

Bildschirmfoto zu 2020-05-13 09-27-05

Edit:
And it is still called Blocklist (v5.0 terminology is Adlist)

@abacao
Copy link

abacao commented May 21, 2020

Can the option of long term data be there and not be enabled as default?

Maybe a line like this:

empty box Long term data (357Mb)

I would appreciate the possibility of this not only as an exporting/importing tool but also as a general backup tool...

@DL6ER
Copy link
Member Author

DL6ER commented May 21, 2020

-rw-r--r-- 1 pihole pihole 544M May 21 12:50 /etc/pihole/pihole-FTL.db

I tried adding it to the Teleporter archive and PHP crashed with out-of-memory. I tried again with slimed down copies (truncated database to the last 6 months, then 3 months, then 2, then 1 and ran VACUUM every time) and only the last iteration worked.

-rw-r--r-- 1 pihole pihole  58M May 21 12:58 /etc/pihole/pihole-FTL_one_month.db

I don't think that's an option, not even a by default disabled one, as it will fail for almost everyone trying this (I have PHP configured to take up to 512 MB of memory).

@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/add-cname-record-support-to-pi-hole-5s-local-dns-records/31346/6

@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/import-export-group-management-data-5-x-teleporter/30345/3

@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/snapshot-backup-restore/1190/11

@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/backup-umziehen-auf-pi4-mitsamt-allen-einstellungen/34088/4

@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/should-teleporter-export-all-settings/35181/2

@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
@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/pi-hole-5-1-released/35577/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants