This commit is contained in:
Charlotte 🦝 Delenk 2022-11-02 18:57:12 +01:00
parent 128505eac1
commit 1e060b5f3a
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 15 additions and 17 deletions

View file

@ -46,7 +46,7 @@ class DefaultConfig(object):
SECRET_KEY = '1Cl7ET1t3MKQb3kGEkiAy'
TWITTER_CONSUMER_KEY = '4qJKzkQK4FcXYCiiiHKjB2cSE'
TWITTER_CONSUMER_SECRET = 'vahm3TpA0TKfBilJbrUsEz5ABvpUKuJPWTtNCWGLrMNLVDHVwUP'
WORKER_JOBS = 10
WORKER_JOBS = 1
class ProductionConfig(DefaultConfig):
@ -56,7 +56,7 @@ class ProductionConfig(DefaultConfig):
TWITTER_CONSUMER_SECRET = open(
"/run/secrets/services/moa/twitter_consumer_secret").read()
SANITIZE_TWITTER_HANDLES = False
SQLALCHEMY_DATABASE_URI = "postgresql+pyscopg2://moa@/moa?host=/run/postgresql"
SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://moa@/moa?host=/run/postgresql"
class DevelopmentConfig(DefaultConfig):

View file

@ -9,9 +9,8 @@
after = ["network.target"];
wantedBy = ["multi-user.target"];
environment = {
FLASK_RUN_PORT = toString 58023;
PYTHONPATH = toString ./.;
MOA_CONFIG = "config.ProductionConfig";
MOA_CONFIG = "ProductionConfig";
};
serviceConfig = {
Type = "simple";
@ -26,9 +25,8 @@
after = ["network.target"];
wantedBy = ["multi-user.target"];
environment = {
FLASK_RUN_PORT = toString 58023;
PYTHONPATH = toString ./.;
MOA_CONFIG = "config.ProductionConfig";
MOA_CONFIG = "ProductionConfig";
};
serviceConfig = {
Type = "simple";
@ -61,7 +59,7 @@
useACMEHost = "int.chir.rs";
extraConfig = ''
import baseConfig
reverse_proxy http://localhost:58023
reverse_proxy http://localhost:5000
'';
};
sops.secrets."services/moa/secret".owner = "moa";

View file

@ -598,11 +598,11 @@
]
},
"locked": {
"lastModified": 1667402493,
"narHash": "sha256-xjKX8KRzCoicAojpyXhEx/3p5SzNM1XqXk85UWRQ9BQ=",
"lastModified": 1667423076,
"narHash": "sha256-0QUa2SBk/+S+q4hBpTSembUtHdiWjIex7tgb6jIoPkA=",
"ref": "main",
"rev": "59f08fd86dde7cd73c44f4fdc4eb01c20178aa8c",
"revCount": 321,
"rev": "31d36925f77febc11189dbc015f2593f17b9a4ff",
"revCount": 331,
"type": "git",
"url": "https://git.chir.rs/DarkKirb/nix-packages"
},

View file

@ -4,10 +4,10 @@ network:
services:
moa:
secret: ENC[AES256_GCM,data:ySHuTf0By31PJN3GgV9sMxYqCllUaA==,iv:x6Esv1QRR5rQmi1C7SXVfRlrh5m0oRoufPMp5BElaVQ=,tag:6dieM2XhmycKlz9iDa+6Eg==,type:str]
twitter_consumer_key: ENC[AES256_GCM,data:fJz+aj4MxssGcYuZuligCnYNZDSIjBdOXgcvFQUaesngkg==,iv:Omom5Jrbb8+vzkoBMmE7FTW5Anp8JrOLWKZRLySeSS0=,tag:OvMzwuPatEqsN+o2J8JONg==,type:str]
twitter_consumer_secret: ENC[AES256_GCM,data:IULcp3SA4CBmvJWdC4v5nfFnpVAdpvZ/EHQSjSDWyeLcw6wU8kDW3RCX3SmoO/xnPPc=,iv:P6vHwBJJC5I1Dpqbq/DgqGLMLNun0cRdAMyw7NBjrRc=,tag:QBa6o7QPajLI/HvM4i21uQ==,type:str]
twitter_app_key: ENC[AES256_GCM,data:qyHWrlQciQYZswirtUTvtqPrTjUqV6fbxQ==,iv:eEBwceUREmwr8LtVxzlr7l+Zsq1h+U2Dkx6gzOAg0QI=,tag:LpN+syWreIFR5dCEFE9l0Q==,type:str]
twitter_app_secret: ENC[AES256_GCM,data:fCrzsuzmTKkjv6ox/rdBrl3/ylAueAmKDaW6QTzIUnF6ZcEj9j0xqwSPERhLmYSubmA=,iv:dUrSYKDaJC3kjqY3XRGLDSZWFPPwyYGLUGdUrTpF90c=,tag:mkKY9wZ+mWhHbjch2+3GLg==,type:str]
twitter_oauth_key: ENC[AES256_GCM,data:rIl6xauEQ002kFwZUMcbD5JlubikFcoESJ4ZNcfxF2rR+Q==,iv:IQAfmf9J9+naCaG0dtVXQ1y5XUryB/m25CNg955qQEw=,tag:KqP1YTAIZSz8AShYxd4EBw==,type:str]
twitter_oauth_secret: ENC[AES256_GCM,data:4iguhcWWF1+it/6vTKv07w/wZoEyThI3AkEWPY8+9cPBlpJ29XnTR4ktf5RNghAgq74=,iv:kflhbfkGTjeNlxC+I8lowzNEi0C1bkC8W37Up/eTTkE=,tag:xWuf9Q3Yiz+zHVp2kC8hAw==,type:str]
twitter_consumer_key: ENC[AES256_GCM,data:v7N/BlSmaXH7fBeCiR6Hy3KB2oyuaxsbAw==,iv:Rnvb14VQFjtFi52xJsKRlE5xMnELYTv/o0lkDw4e2T0=,tag:jFVuLqzJmjhCw2bczsfcjg==,type:str]
twitter_consumer_secret: ENC[AES256_GCM,data:Y+OWe/yeXQCGiX5SIpqRAifFTlFDXL6RBAv1q5z7sRoHrY/JOfGi0o5gcNjasaiOzfY=,iv:ZXbVJjgGqx59VltRZs0vnlMjlGTu/jnYWv/Wn6Jz74o=,tag:dI+pzaQmpWXIVlWLuE7V1g==,type:str]
twitter_bearer_token: ENC[AES256_GCM,data:2D0o4iRHt88PXFK1SQ+RAMHIbXynG7CSoFa/Z+iis5ebODfBkBegsCIxwt+iOVJszrMax8e8xznCGfJG4v/Co6rbIsgVaswnnsi4Lkp4iw2U5iPO8UUHHo8NjzjY+pzlUdUg1hf873nirXTOLOewKfUC,iv:kkZkYQxLsGgoCozY4JACPGATxHGP5CCTU/belHRReLk=,tag:ZCXEUEbuuCE4gNJO1NWLSg==,type:str]
github-runner:
nixos.token: ENC[AES256_GCM,data:qqtjAKCDxX0+Hvl5n9nglwYW4JdHlkEcu0cot4Y=,iv:m8Dd2QYYmwaVoGu8BB/JA3Ii0Y3fP3GhZaR8tpZmXcw=,tag:w8J8kw3KxwbxxCsKgBc3+Q==,type:str]
@ -70,8 +70,8 @@ sops:
WnV3QWxtalIzWFdoQmpDTmJsNGdNOW8K++rFGXy0G6Gcu2gQwSP6xfXInQ/y5nh5
2oGp8sfOLFWnNI4SWL0ChP47K3C/9ysUHwQnUYPbRafZ/4X6cN40ZQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2022-11-02T15:49:49Z"
mac: ENC[AES256_GCM,data:kIi0F0vBZ1W4EeCPBUWaj1CwVFiBkbvqLth417wNUdooBVV/8+X0fztq923DRrPEXGLDCblgSA/CZlx5GiFJ/udDoO6uhr8Es5Q3uiivB+5LYfmCL5zoENhSWp2wsHj8nFnKbFJSzxIMC2ehjbJKSCjxwJtg1qE+j4N4ACWrNzA=,iv:fH2y4sNiMK9kloqJYONhNXQCRdHTru+dQ3KlcHmz+Uc=,tag:/WXrfuqTK6Fx39Aw3Lp8VQ==,type:str]
lastmodified: "2022-11-02T20:16:01Z"
mac: ENC[AES256_GCM,data:7+qzxrPJbIr794iq89k1y98jg17FAnDmIizZO1S2j0YaFbxKaRNy/tPSFr8s6FsLBf+JwQohzVodxKOS+tveVGQppnnyNMOKYelzevAq0mhlvFmZpV9i/cJzg7tJ57gCjrpRdeENYqobFRm6ETSC1cvbOTUtSNApD28c5rJxvRQ=,iv:pRrdNOehIRayNvecHT/a8c8YCeSbVGBijTU5MBdDDuA=,tag:Z32bZBNrLYKhqm/VkbH4pw==,type:str]
pgp:
- created_at: "2022-04-24T10:34:20Z"
enc: |