Browse Source

remove macvendor

yalh76 1 year ago
parent
commit
f5c199ca19
4 changed files with 11 additions and 8 deletions
  1. 1 1
      conf/pihole.toml
  2. 0 5
      manifest.toml
  3. 0 1
      scripts/install
  4. 10 1
      scripts/upgrade

+ 1 - 1
conf/pihole.toml

@@ -907,7 +907,7 @@
   #
   # Possible values are:
   #     <any Pi-hole macvendor database>
-  macvendor = "/etc/pihole/macvendor.db"
+  # macvendor = "/etc/pihole/macvendor.db"
 
   # The old config file of Pi-hole used before v6.0
   #

+ 0 - 5
manifest.toml

@@ -91,11 +91,6 @@ ram.runtime = "200M"
     rename = "pihole-FTL"
     extract = "false"
 
-    [resources.sources.macvendor]
-    url = "https://ftl.pi-hole.net/macvendor.db"
-    sha256 = "ff08e7ddc4fc940c988628a2c4bd6d3b7857d873e5a807ec9448d7f7748a829a"
-    extract = "false"
-
     [resources.system_user]
 
     [resources.install_dir]

+ 0 - 1
scripts/install

@@ -29,7 +29,6 @@ ynh_script_progression --message="Setting up source files..." --weight=4
 ynh_setup_source --dest_dir="$PI_HOLE_LOCAL_REPO"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="/usr/bin"
-ynh_setup_source --source_id="macvendor" --dest_dir="$PI_HOLE_CONFIG_DIR"
 
 chmod +x "/usr/bin/pihole-FTL"
 

+ 10 - 1
scripts/upgrade

@@ -26,6 +26,16 @@ ynh_systemd_action --service_name="pihole-FTL" --action="stop" --log_path="/var/
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
+# Before version 6.x pihole could be installed under a path,
+# this functionnality has been deprecated since version 6.0.0 and pihole
+# now need to be installed under its own domain.
+# If the app is currently installed under a path, we warn the admin
+# that he should move the app under its own domain
+if [ "$path" != "/" ]; then
+  ynh_die --message="Since version 6.0.0, $app need to be installed under its own domain. \
+  Before upgrading, change $app URL: delete the path and switch to a new domain if needed."
+fi
+
 # If overwrite_setupvars doesn't exist, create it
 if [ -z "${overwrite_setupvars:-}" ]; then
     overwrite_setupvars=1
@@ -55,7 +65,6 @@ ynh_script_progression --message="Upgrading source files..." --weight=4
 ynh_setup_source --dest_dir="$PI_HOLE_LOCAL_REPO"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="/usr/bin"
-ynh_setup_source --source_id="macvendor" --dest_dir="$PI_HOLE_CONFIG_DIR"
 
 chmod +x "/usr/bin/pihole-FTL"