Add adlists.list to Teleport

frankied210 · December 10, 2018, 4:53pm

If adlists.list was added to Teleport Export/Import, it would simplify sync configuration for those of us running multiple PiHoles.
Additionally, the host file as well. I would then only have to update these files on one PiHole and then Export and Import them to additional PiHoles.

Mcat12 · December 10, 2018, 5:17pm

The adlist file is already added to the archive:

github.com

pi-hole/AdminLTE/blob/5ec769d9d8ed70d43e1d774722d6e9a7f5002f14/scripts/pi-hole/php/teleporter.php#L181


	$filename = $tarname.".gz";
	$archive_file_name = sys_get_temp_dir() ."/". $tarname;
	$archive = new PharData($archive_file_name);

	if ($archive->isWritable() !== TRUE) {
		exit("cannot open/create ".htmlentities($archive_file_name)."<br>\nPHP user: ".exec('whoami')."\n");
	}

	archive_add_file("/etc/pihole/","whitelist.txt");
	archive_add_file("/etc/pihole/","blacklist.txt");
	archive_add_file("/etc/pihole/","adlists.list");
	archive_add_file("/etc/pihole/","setupVars.conf");
	archive_add_file("/etc/pihole/","auditlog.list");
	archive_add_file("/etc/pihole/","regex.list");
	archive_add_directory("/etc/dnsmasq.d/","dnsmasq.d/");

	$archive->compress(Phar::GZ); // Creates a gziped copy
	unlink($archive_file_name); // Unlink original tar file as it is not needed anymore
	$archive_file_name .= ".gz"; // Append ".gz" extension to ".tar"

	header("Content-type: application/zip");

You can add hosts via a custom dnsmasq config in /etc/dnsmasq.d/, and the configs will also be backed up.

jfb · December 10, 2018, 5:19pm

It would be handy to have the /etc/hosts file copied as well.

Mcat12 · December 10, 2018, 5:23pm

That is a questionable file to add. It is not modified or explicitly handled by Pi-hole (besides being used by dnsmasq), and all of the functionality it provides can be done via dnsmasq configs which are already backed up. Also, it can not be safely restored because it could contain machine-specific hosts.

frankied210 · December 10, 2018, 5:33pm

Interesting. Why isn't there an option for Importing it if it's included in the archive?

Mcat12 · December 10, 2018, 5:35pm

Mostly a lack of time available to work on development and feature requests. Also, we are focusing on the new API and web interface, which will eventually replace all of this code.

DL6ER · December 10, 2018, 5:44pm

Furthermore, this list is not imported as we currently don't have a CLI command implemented and tested that allows to add/replace adlists whereas such commands are available for the white- and blacklists (pihole -w / -b) as well as the regex and audit domains lists (pihole -a audit).

jfb · December 10, 2018, 5:55pm

Good point.

gevrey · May 2, 2020, 6:46pm

I was wondering too: why isn't /etc/pihole/pihole-FTL.conf included?

DanSchaper · May 2, 2020, 9:12pm

Open a new feature request for it.

jfb · May 2, 2020, 9:37pm

The adlists file is included in the teleporter export for V5.0, and can also be imported using the teleporter.