jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

block: import blocklist from roskomsvoboda

Browse source
This commit is contained in:
Iain Learmonth 2022-05-09 14:11:05 +01:00
parent af0b808cfd
commit 5dfc3931a8
2 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/cli/automate.py
View file

@ -10,6 +10,7 @@ from app.terraform import BaseAutomation
from app.terraform.block_bridge_github import BlockBridgeGitHubAutomation
from app.terraform.block_external import BlockExternalAutomation
from app.terraform.block_ooni import BlockOONIAutomation
from app.terraform.block_roskomsvoboda import BlockRoskomsvobodaAutomation
from app.terraform.eotk import EotkAutomation
from app.terraform.alarms.proxy_azure_cdn import AlarmProxyAzureCdnAutomation
from app.terraform.alarms.proxy_cloudfront import AlarmProxyCloudfrontAutomation
@ -34,6 +35,7 @@ jobs = {
BlockBridgeGitHubAutomation,
BlockExternalAutomation,
BlockOONIAutomation,
BlockRoskomsvobodaAutomation,
BridgeAWSAutomation,
BridgeGandiAutomation,
BridgeHcloudAutomation,
@ -86,7 +88,8 @@ def run_job(job: BaseAutomation, *, force: bool = False, ignore_schedule: bool =
logs = repr(e)
if success:
automation.state = AutomationState.IDLE
automation.next_run = datetime.datetime.utcnow() + datetime.timedelta(minutes=7)
automation.next_run = datetime.datetime.utcnow() + datetime.timedelta(
minutes=getattr(job, "frequency", 7))
else:
automation.state = AutomationState.ERROR
automation.enabled = False