From 703dc87d058bb9e73ca23070472400b7d6827f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Thu, 18 Jan 2024 11:19:31 +0100 Subject: [PATCH] MirrorManager: adjust config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .../templates/mirrormanager2.cfg.py | 141 +++++++++--------- 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/roles/openshift-apps/mirrormanager/templates/mirrormanager2.cfg.py b/roles/openshift-apps/mirrormanager/templates/mirrormanager2.cfg.py index c092807cce..75d83b53fc 100644 --- a/roles/openshift-apps/mirrormanager/templates/mirrormanager2.cfg.py +++ b/roles/openshift-apps/mirrormanager/templates/mirrormanager2.cfg.py @@ -8,13 +8,13 @@ # from datetime import timedelta # PERMANENT_SESSION_LIFETIME = timedelta(hours=1) -{% if env == 'staging' %} +{% if env == "staging" %} # url to the database server: -SQLALCHEMY_DATABASE_URI = 'postgresql://{{ mirrormanager_stg_db_user }}:{{ mirrormanager_stg_db_pass }}@{{ mirrormanager_db_host }}/{{ mirrormanager_stg_db_name }}' +SQLALCHEMY_DATABASE_URI = "postgresql://{{ mirrormanager_stg_db_user }}:{{ mirrormanager_stg_db_pass }}@{{ mirrormanager_db_host }}/{{ mirrormanager_stg_db_name }}" # secret key used to generate unique csrf token -SECRET_KEY = '{{ mirrormanager_stg_secret_key }}' +SECRET_KEY = "{{ mirrormanager_stg_secret_key }}" # Seed used to make the password harder to brute force in case of leaking # This should be kept really secret! @@ -23,10 +23,10 @@ PASSWORD_SEED = "{{ mirrormanager_stg_password_seed }}" {% else %} # url to the database server: -SQLALCHEMY_DATABASE_URI = 'postgresql://{{ mirrormanager_db_user }}:{{ mirrormanager_db_pass }}@{{ mirrormanager_db_host }}/{{ mirrormanager_db_name }}' +SQLALCHEMY_DATABASE_URI = "postgresql://{{ mirrormanager_db_user }}:{{ mirrormanager_db_pass }}@{{ mirrormanager_db_host }}/{{ mirrormanager_db_name }}" # secret key used to generate unique csrf token -SECRET_KEY = '{{ mirrormanager_secret_key }}' +SECRET_KEY = "{{ mirrormanager_secret_key }}" # Seed used to make the password harder to brute force in case of leaking # This should be kept really secret! @@ -43,32 +43,32 @@ SESSION_COOKIE_SECURE=True # Folder containing the theme to use. # Default: ``fedora``. -# THEME_FOLDER = 'fedora' +# THEME_FOLDER = "fedora" # Which authentication method to use, defaults to `fas` can be or `local` # Default: ``fas``. -# MM_AUTHENTICATION = 'fas' +# MM_AUTHENTICATION = "fas" -OIDC_CLIENT_SECRETS = '/etc/mirrormanager-secrets/client_secrets.json' +OIDC_CLIENT_SECRETS = "/etc/mirrormanager-secrets/client_secrets.json" # If the authentication method is `fas`, groups in which should be the user # to be recognized as an admin. -ADMIN_GROUP = ['sysadmin-main', 'sysadmin-web'] +ADMIN_GROUP = ["sysadmin-main", "sysadmin-web"] # Email of the admin to which send notification or error -# ADMIN_EMAIL = 'admin@fedoraproject.org' +# ADMIN_EMAIL = "admin@fedoraproject.org" -# Email address used in the 'From' field of the emails sent. +# Email address used in the "From" field of the emails sent. # Default: ``nobody@fedoraproject.org``. -# EMAIL_FROM = 'nobody@fedoraproject.org' +# EMAIL_FROM = "nobody@fedoraproject.org" # SMTP server to use, # Default: ``localhost``. -SMTP_SERVER = 'bastion{{ env_suffix }}.fedoraproject.org' +SMTP_SERVER = "bastion{{ env_suffix }}.fedoraproject.org" # If the SMTP server requires authentication, fill in the information here -# SMTP_USERNAME = 'username' -# SMTP_PASSWORD = 'password' +# SMTP_USERNAME = "username" +# SMTP_PASSWORD = "password" # When this is set to True, an additional menu item is shown which can # be used to browse the different statistics generated by @@ -77,20 +77,23 @@ SMTP_SERVER = 'bastion{{ env_suffix }}.fedoraproject.org' # This is the directory the code enabled by SHOW_STATISTICS will use # to locate the statistics files and display them. -STATISTICS_BASE = '/var/lib/mirrormanager/statistics/data' +# STATISTICS_BASE = "/var/lib/mirrormanager/statistics/data" # Countries which have to be excluded. -EMBARGOED_COUNTRIES = ['CU', 'IR', 'KP', 'SD', 'SY'] +EMBARGOED_COUNTRIES = ["CU", "IR", "KP", "SD", "SY"] # When this is set to True, an additional menu item is shown which # displays the maps generated with mm2_generate-worldmap. # SHOW_MAPS = True +# Where to look for maps +# MAPS_BASE = "/var/lib/mirrormanager/statistics/map" + # Location of the static map displayed in the map tab. -# STATIC_MAP = '/map/map.png' +# STATIC_MAP = "map.png" # Location of the interactive openstreetmap based map. -# INTERACTIVE_MAP = '/map/mirrors.html' +# INTERACTIVE_MAP = "mirrors.html" # The crawler can generate propagation statistics which can be # converted into svg/pdf with mm2_propagation. These files @@ -98,7 +101,7 @@ EMBARGOED_COUNTRIES = ['CU', 'IR', 'KP', 'SD', 'SY'] # SHOW_PROPAGATION = True # Where to look for the above mentioned propagation images. -PROPAGATION_BASE = '/var/lib/mirrormanager/statistics/data/propagation' +# PROPAGATION_BASE = "/var/lib/mirrormanager/statistics/data/propagation" # Where the GeoIP database lives GEOIP_BASE = "/var/lib/mirrormanager/geoip" @@ -117,27 +120,27 @@ GEOIP_BASE = "/var/lib/mirrormanager/geoip" # The name of the cookie used to store the session id. # Default: ``.MirrorManager``. -# MM_COOKIE_NAME = 'MirrorManager' +# MM_COOKIE_NAME = "MirrorManager" # If this variable is set (and the directory exists) the crawler # will create per host log files in MM_LOG_DIR/crawler/.log # which can the be used in the web interface by the mirror admins. # Other parts besides the crawler are also using this variable to # decide where to store log files. -MM_LOG_DIR = '-' +MM_LOG_DIR = "-" # This is used to exclude certain protocols to be entered # for host category URLs at all. # The following is the default for Fedora to exclude FTP based # mirrors to be added. Removing this confguration option -# or setting it to '' removes any protocol restrictions. -# MM_PROTOCOL_REGEX = '^(?!ftp)(.*)$' +# or setting it to "" removes any protocol restrictions. +# MM_PROTOCOL_REGEX = "^(?!ftp)(.*)$" # The netblock size parameters define which netblock sizes can be # added by a site administrator. Larger networks can only be added by # mirrormanager admins. -# MM_IPV4_NETBLOCK_SIZE = '/16' -# MM_IPV6_NETBLOCK_SIZE = '/32' +# MM_IPV4_NETBLOCK_SIZE = "/16" +# MM_IPV6_NETBLOCK_SIZE = "/32" # If not specified the application will rely on the root_url when sending # emails, otherwise it will use this URL @@ -153,17 +156,17 @@ MM_LOG_DIR = '-' # Specify additional rsync parameters for the crawler # # --timeout 14400: abort rsync crawl after 4 hours # # --no-human-readable: because rsync made things pretty by default in 3.1.x -CRAWLER_RSYNC_PARAMETERS = '--no-motd --timeout 14400 --exclude=lost+found --no-human-readable' +CRAWLER_RSYNC_PARAMETERS = "--no-motd --timeout 14400 --exclude=lost+found --no-human-readable" # This is a list of directories which MirrorManager will ignore while guessing # the version and architecture from a path. SKIP_PATHS_FOR_VERSION = [ - 'pub/alt', - 'pub/fedora/linux/releases/test', - 'pub/archive', - 'pub/fedora-secondary/development/rawhide/s390/' - 'pub/fedora-secondary/development/rawhide/Modular/ppc64/os', - 'pub/fedora-secondary/development/rawhide/Modular/ppc64/debug/tree' + "pub/alt", + "pub/fedora/linux/releases/test", + "pub/archive", + "pub/fedora-secondary/development/rawhide/s390/" + "pub/fedora-secondary/development/rawhide/Modular/ppc64/os", + "pub/fedora-secondary/development/rawhide/Modular/ppc64/debug/tree" ] ### @@ -177,63 +180,63 @@ CRAWLER_SEND_EMAIL = False # the host will be disable automatically (user_active) # CRAWLER_AUTO_DISABLE = 4 -UMDL_PREFIX = '/srv/' +UMDL_PREFIX = "/srv/" -umdl_master_directories = [ +UMDL_MASTER_DIRECTORIES = [ { - 'type': 'directory', - 'path': '/srv/pub/epel/', - 'category': 'Fedora EPEL' + "type": "directory", + "path": "/srv/pub/epel/", + "category": "Fedora EPEL" }, { - 'type': 'directory', - 'path': '/srv/pub/fedora/linux/', - 'category': 'Fedora Linux' + "type": "directory", + "path": "/srv/pub/fedora/linux/", + "category": "Fedora Linux" }, { - 'type': 'directory', - 'path': '/srv/pub/fedora-secondary/', - 'category': 'Fedora Secondary Arches' + "type": "directory", + "path": "/srv/pub/fedora-secondary/", + "category": "Fedora Secondary Arches" }, { - 'type': 'directory', - 'path': '/srv/pub/archive/', - 'category': 'Fedora Archive' + "type": "directory", + "path": "/srv/pub/archive/", + "category": "Fedora Archive" }, { - 'type': 'directory', - 'path': '/srv/pub/alt/', - 'category': 'Fedora Other' + "type": "directory", + "path": "/srv/pub/alt/", + "category": "Fedora Other" }, { - 'type': 'directory', - 'path': '/srv/codecs.fedoraproject.org/', - 'category': 'Fedora Codecs' + "type": "directory", + "path": "/srv/codecs.fedoraproject.org/", + "category": "Fedora Codecs" }, # { -# 'type':'directory', -# 'path':'../testdata/pub/fedora/linux/', -# 'category':'Fedora Linux', -# 'excludes':['.*/core/?.*', '.*/extras/?.*', '.*/[7-8]/?.*' ] +# "type":"directory", +# "path":"../testdata/pub/fedora/linux/", +# "category":"Fedora Linux", +# "excludes":[".*/core/?.*", ".*/extras/?.*", ".*/[7-8]/?.*" ] # }, # { -# 'type':'rsync', -# 'url':'rsync://archive.ubuntu.com/ubuntu/', -# 'category':'Ubuntu Archive' +# "type":"rsync", +# "url":"rsync://archive.ubuntu.com/ubuntu/", +# "category":"Ubuntu Archive" # }, # { -# 'type':'rsync', -# 'url':'rsync://releases.ubuntu.com/releases/', -# 'category':'Ubuntu CD Images' +# "type":"rsync", +# "url":"rsync://releases.ubuntu.com/releases/", +# "category":"Ubuntu CD Images" # }, # { -# 'type':'rsync', -# 'url':'rsync://ports.ubuntu.com/ubuntu-ports/', -# 'category':'Ubuntu Ports Archive' +# "type":"rsync", +# "url":"rsync://ports.ubuntu.com/ubuntu-ports/", +# "category":"Ubuntu Ports Archive" # }, # { -# 'type':'rsync', -# 'url':'rsync://security.ubuntu.com/ubuntu/', -# 'category':'Ubuntu Security Archive' +# "type":"rsync", +# "url":"rsync://security.ubuntu.com/ubuntu/", +# "category":"Ubuntu Security Archive" # }, ]