YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert publicsuffix changes in dnsrecord diagnoser

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-12 15:44:51 +02:00
parent 41cf266e25
commit 88a624ddbc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/hooks/diagnosis/12-dnsrecords.py
View file

@ -4,15 +4,16 @@ import os
import re import re
from datetime import datetime, timedelta from datetime import datetime, timedelta
from publicsuffixlist import PublicSuffixList from publicsuffix import PublicSuffixList
from moulinette.utils.process import check_output from moulinette.utils.process import check_output
from yunohost.utils.dns import dig, YNH_DYNDNS_DOMAINS from yunohost.utils.dns import dig
from yunohost.diagnosis import Diagnoser from yunohost.diagnosis import Diagnoser
from yunohost.domain import domain_list, _get_maindomain from yunohost.domain import domain_list, _get_maindomain
from yunohost.dns import _build_dns_conf from yunohost.dns import _build_dns_conf
YNH_DYNDNS_DOMAINS = ["nohost.me", "noho.st", "ynh.fr"]
SPECIAL_USE_TLDS = ["local", "localhost", "onion", "test"] SPECIAL_USE_TLDS = ["local", "localhost", "onion", "test"]
@ -44,7 +45,7 @@ class DNSRecordsDiagnoser(Diagnoser):
# Check if a domain buy by the user will expire soon # Check if a domain buy by the user will expire soon
psl = PublicSuffixList() psl = PublicSuffixList()
domains_from_registrar = [ domains_from_registrar = [
psl.publicsuffix(domain) for domain in all_domains psl.get_public_suffix(domain) for domain in all_domains
] ]
domains_from_registrar = [ domains_from_registrar = [
domain for domain in domains_from_registrar if "." in domain domain for domain in domains_from_registrar if "." in domain