Compare commits

..

No commits in common. "f075d4f3cd3e212c23b1c0d740019435a9df5f0f" and "1d2bfa9df9293ff50888ea0febf1f29f179d3299" have entirely different histories.

3 changed files with 7 additions and 12 deletions

View file

@ -19,10 +19,10 @@ def www_conf(metadata):
'listen.owner': 'www-data', 'listen.owner': 'www-data',
'listen.group': 'www-data', 'listen.group': 'www-data',
'pm': 'dynamic', 'pm': 'dynamic',
'pm.max_children': '60', 'pm.max_children': '100',
'pm.start_servers': '20', 'pm.start_servers': '40',
'pm.min_spare_servers': '10', 'pm.min_spare_servers': '30',
'pm.max_spare_servers': '20', 'pm.max_spare_servers': '60',
'pm.max_requests': '500', 'pm.max_requests': '500',
}, },
}, },

View file

@ -1,5 +1,4 @@
# https://manpages.debian.org/jessie/apt/sources.list.5.de.html # https://manpages.debian.org/jessie/apt/sources.list.5.de.html
from urllib.parse import urlparse from urllib.parse import urlparse
from re import search, sub from re import search, sub
from functools import total_ordering from functools import total_ordering
@ -8,20 +7,16 @@ from functools import total_ordering
@total_ordering @total_ordering
class AptSource(): class AptSource():
def __init__(self, string): def __init__(self, string):
# parse options, which are optional
if search(r'\[.*\]', string): if search(r'\[.*\]', string):
self.options = { self.options = {
k:v.split(',') for k,v in ( k:v.split(',') for k,v in (
e.split('=') for e in search(r'\[(.*)\]', string)[1].split() e.split('=') for e in search(r'\[(.*)\]', string)[1].split()
) )
} }
string_without_options = sub(r'\[.*\]', '', string)
else: else:
self.options = {} self.options = {}
string_without_options = string
# parse rest of source, now in defined order parts = sub(r'\[.*\]', '', string).split()
parts = string_without_options.split()
self.type = parts[0] self.type = parts[0]
self.url = urlparse(parts[1]) self.url = urlparse(parts[1])
self.suite = parts[2] self.suite = parts[2]

View file

@ -54,8 +54,8 @@
'download_server': 'netcup.mails', 'download_server': 'netcup.mails',
}, },
'gitea': { 'gitea': {
'version': '1.16.2', 'version': '1.15.5',
'sha256': 'ec9b01d119cfe47df44d580c1d321132ce054ff139b05b0a35da91268ca2bcbe', 'sha256': 'c3f190848c271bf250d385b80c1a98a7e2c9b23d092891cf1f7e4ce18c736484',
'domain': 'git.sublimity.de', 'domain': 'git.sublimity.de',
}, },
'gollum': { 'gollum': {