backend/internal/PiHoleDNSPlugin.js

@@ -2,17 +2,13 @@ const axios   = require('axios');
 const cheerio = require('cheerio');
 const qs      = require('querystring');
 
-const PIHOLE_PLUGIN_ENABLED = process.env.PIHOLE_PLUGIN_ENABLED === 'true';
+
-const PIHOLE_PASSWORD       = process.env.PIHOLE_PASSWORD;
+const PIHOLE_PASSWORD      = process.env.PIHOLE_PASSWORD;
-const PIHOLE_LOGIN_URL      = 'http://'+process.env.PIHOLE_IP+'/admin/index.php';
+const PIHOLE_LOGIN_URL     = 'http://'+process.env.PIHOLE_IP+'/admin/index.php';
-const PIHOLE_CUSTOMDNS_URL  = 'http://'+process.env.PIHOLE_IP+'/admin/scripts/pi-hole/php/customdns.php';
+const PIHOLE_CUSTOMDNS_URL = 'http://'+process.env.PIHOLE_IP+'/admin/scripts/pi-hole/php/customdns.php';
 
 // Function to update Pi-hole with domain and IP
-async function updatePihole(domain, ip, action) {
+async function updatePihole(domain, ip) {
-	// Check if the Pi-hole plugin is enabled
-	if (!PIHOLE_PLUGIN_ENABLED) {
-		return;
-	}
 	try {
 		// Step 1: Login to Pi-hole to get session cookie
 		const loginResponse = await axios.post(PIHOLE_LOGIN_URL, qs.stringify({
@@ -26,6 +22,7 @@ async function updatePihole(domain, ip, action) {
 		});
 
 		if (loginResponse.status === 200) {
+			console.log('Login successful');
 			// Extract session cookie (PHPSESSID)
 			const cookies       = loginResponse.headers['set-cookie'];
 			const sessionCookie = cookies.find((cookie) => cookie.startsWith('PHPSESSID'));
@@ -47,6 +44,7 @@ async function updatePihole(domain, ip, action) {
 			// Extract token value from element with ID "token"
 			const token = $('#token').text().trim();
 
+			console.log('Token retrieved:', token);
 
 			// Step 3: Add custom DNS record with explicit session cookie and token
 			const headers = {
@@ -62,7 +60,7 @@ async function updatePihole(domain, ip, action) {
 
 			// Request data including token
 			const requestData = {
-				action: action,
+				action: 'add',
 				ip:     ip,
 				domain: domain,
 				token:  token  // Use the token retrieved from the HTML page
@@ -73,7 +71,7 @@ async function updatePihole(domain, ip, action) {
 				headers: headers
 			});
 
-			console.log('PiHole API:', addRecordResponse.data);
+			console.log('Custom DNS record added:', addRecordResponse.data);
 		} else {
 			console.error('Login failed:', loginResponse.statusText);
 		}

backend/internal/proxy-host.js

@@ -68,7 +68,7 @@ const internalProxyHost = {
 
 							// Update PiHole
 							for (let i = 0; i < row.domain_names.length; i++) {
-								piHole.updatePihole(row.domain_names[i], row.forward_host, 'add').then();
+								piHole.updatePihole(row.domain_names[i], row.forward_host);
 							}
 
 							return row;
@@ -77,7 +77,7 @@ const internalProxyHost = {
 
 					// Update PiHole
 					for (let i = 0; i < row.domain_names.length; i++) {
-						piHole.updatePihole(row.domain_names[i], row.forward_host, 'add').then();
+						piHole.updatePihole(row.domain_names[i], row.forward_host);
 					}
 
 					return row;
@@ -166,18 +166,9 @@ const internalProxyHost = {
 							data.certificate_id = cert.id;
 						})
 						.then(() => {
-							// Update PiHole
-							for (let i = 0; i < row.domain_names.length; i++) {
-								piHole.updatePihole(row.domain_names[i], row.forward_host, 'delete').then();
-							}
 							return row;
 						});
 				} else {
-					// Update PiHole
-					for (let i = 0; i < row.domain_names.length; i++) {
-						piHole.updatePihole(row.domain_names[i], row.forward_host, 'delete').then();
-
-					}
 					return row;
 				}
 			})
@@ -203,7 +194,6 @@ const internalProxyHost = {
 							meta:        data
 						})
 							.then(() => {
-
 								return saved_row;
 							});
 					});
@@ -223,9 +213,6 @@ const internalProxyHost = {
 							.then((new_meta) => {
 								row.meta = new_meta;
 								row      = internalHost.cleanRowCertificateMeta(row);
-								for (let i = 0; i < row.domain_names.length; i++) {
-									piHole.updatePihole(row.domain_names[i], row.forward_host, 'add').then();
-								}
 								return _.omit(row, omissions());
 							});
 					});
@@ -301,11 +288,6 @@ const internalProxyHost = {
 						is_deleted: 1
 					})
 					.then(() => {
-						// Update PiHole
-
-						for (let i = 0; i < row.domain_names.length; i++) {
-							piHole.updatePihole(row.domain_names[i], row.forward_host, 'delete').then();
-						}
 						// Delete Nginx Config
 						return internalNginx.deleteConfig('proxy_host', row)
 							.then(() => {

docker/docker-compose.dev.yml

@@ -29,11 +29,6 @@ services:
       DB_MYSQL_NAME: 'npm'
       # DB_SQLITE_FILE: "/data/database.sqlite"
       # DISABLE_IPV6: "true"
-      # pihole:
-      # PIHOLE_PLUGIN_ENABLED: 'true'
-      # PIHOLE_PASSWORD: 'password'
-      # PIHOLE_IP: '192.168.10.2'
-
     volumes:
       - npm_data:/data
       - le_data:/etc/letsencrypt