Changed to filenames to privacy.[rules|domains]

See CHANGELOG

CHANGELOG

@@ -3,14 +3,19 @@ Changelog
 This changelog is only used for "Major" changes to the list setup, like
 new files, sorting or including new external sources.
 
-18. July 2022
+21. May 2023
+  - Ranaming our two spyware files into `privacy.rules` & `privacy.domain`
+    This is done to make the rules cover broader as it infact already
+    includes both spyware and tracking rules.    
+
+1.  July 2022
   - Update of urls to point to Jira support board.
   - Updated urls to match confluence:
     https://spirillen.atlassian.net/wiki/spaces/UOBR
   - Change CI OS to match ubuntu 22.04 for builds
   - Add link to GitLab and Jira (atlassian)
 
-19. May 2021
+2.  May 2021
   - Added a new list `rules/noise.txt` which is to remove all the noises
     from a any webpage. Noise is useless junk that have nothing to do with
     how @spirillen is using a website.

adblocker-rules.template

@@ -75,8 +75,8 @@
 %include ublockorigin-rules:rules/domain_piracy_rules.blacklist%
 
 !------- SpyWare List -------------------------------------------------!
-%include ublockorigin-rules:rules/spyware_domain.blacklist%
-%include ublockorigin-rules:rules/spyware_rule.blacklist%
+%include ublockorigin-rules:rules/privacy.domain%
+%include ublockorigin-rules:rules/privacy.rules%
 
 !------- White List ---------------------------------------------------!
 %include ublockorigin-rules:rules/whitelist_domain.whitelist%

rules/privacy.domain

@@ -3,7 +3,7 @@
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
 ! List url:
-! https://0xacab.org/my-privacy-dns/adblocker-rules-/tree/master/rules/spyware_domain.blacklist
+! https://0xacab.org/my-privacy-dns/adblocker-rules-/tree/master/rules/privacy.domain
 !
 %include ublockorigin-rules:template_header.txt%
 

tools/hostscompilerconf.json

@@ -109,16 +109,16 @@
             ]
         },
         {
-            "name": "My Privacy DNS Filter spyware_domain.blacklist",
-            "source": "rules/spyware_domain.blacklist",
+            "name": "My Privacy DNS Filter privacy.domain",
+            "source": "rules/privacy.domain",
             "type": "adblock",
             "transformations": [
                 "RemoveComments"
             ]
         },
         {
-            "name": "My Privacy DNS Filter spyware_rule.blacklist",
-            "source": "rules/spyware_rule.blacklist",
+            "name": "My Privacy DNS Filter privacy.rules",
+            "source": "rules/privacy.rules",
             "type": "adblock",
             "transformations": [
                 "RemoveComments"