Skip to content

Commit

Permalink
Merge pull request #949 from NittanySeaLion/release/v6.0
Browse files Browse the repository at this point in the history
Adjust references to "Adlist"
  • Loading branch information
yubiuser authored Oct 30, 2023
2 parents 282290e + 1efc89e commit 885cc9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/database/gravity/groups.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Label | Type | Uniqueness enforced | Content
Group management is implemented using so-called linking tables. Hence, it is possible to

- associate domains (and clients!) with any number of groups,
- manage adlists together with groups,
- manage lists together with groups,
- use the same groups for black- and whitelisted domains at the same time.

The linking tables are particularly simple, as they only link group `id`s with list `id`s. As an example, we describe the `domainlist_by_group` table. The `adlist` and `client` linking tables are constructed similarly.
Expand Down
6 changes: 3 additions & 3 deletions docs/database/gravity/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Label | Type | Uniqueness enforced | Content
`date_modified` | integer | No | Timestamp when domain was last modified, automatically updated when a record is changed
`comment` | text | No | Optional field for arbitrary user comments, only field that is allowed to be `NULL`

## Adlist Table (`adlist`)
## List Table (`adlist`)

The `adlist` table contains all sources for domains to be collected by `pihole -g`. Just like the other tables, it has a few extra fields to store metadata related to a given source.

Expand All @@ -48,7 +48,7 @@ Label | Type | Uniqueness enforced | Content

## Gravity Tables (`gravity` and `antigravity`)

The `gravity` and `antigravity` table consists of the domains that have been processed by Pi-hole's `gravity` (`pihole -g`) command. The domains in this list are the collection of domains sourced from the configured sources (see the [`adlist` table](index.md#adlist-table-adlist)).
The `gravity` and `antigravity` table consists of the domains that have been processed by Pi-hole's `gravity` (`pihole -g`) command. The domains in this list are the collection of domains sourced from the configured sources (see the [List Table (`adlist`)](index.md#list-table-adlist)).

During each run of `pihole -g`, these tables are flushed and completely rebuilt from the newly obtained set of domains to be blocked or allowed.

Expand All @@ -57,7 +57,7 @@ Label | Type | Content
`domain` | text | Domain compiled from subscribed list referenced by `adlist_id`
`adlist_id` | integer | ID associated to subscribed list in table `adlist`

Uniqueness is enforced on pairs of (`domain`, `adlist_id`) in both tables. In other words: domains can be added multiple times, however, only when they are referencing different adlists as their origins.
Uniqueness is enforced on pairs of (`domain`, `adlist_id`) in both tables. In other words: domains can be added multiple times, however, only when they are referencing different lists as their origins.

## Client table (`client`)

Expand Down

0 comments on commit 885cc9b

Please sign in to comment.