chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix wallabag

Browse Source
This commit is contained in:
陈浩南
2023-08-15 15:20:15 +08:00
parent 8741456752
commit 1206baf90f
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/services/default.nix
View File

@@ -1102,11 +1102,11 @@ inputs:
extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
environmentFiles = [ inputs.config.sops.templates."wallabag/env".path ];
};
systemd.services.docker-wallabag.serviceConfig =
{
User = "wallabag";
Group = "wallabag";
};
# systemd.services.docker-wallabag.serviceConfig =
# {
# User = "wallabag";
# Group = "wallabag";
# };
sops =
{
templates."wallabag/env".content =
@@ -1120,7 +1120,7 @@ inputs:
SYMFONY__ENV__DATABASE_NAME=wallabag
SYMFONY__ENV__DATABASE_USER=wallabag
SYMFONY__ENV__DATABASE_PASSWORD=${placeholder."postgresql/wallabag"}
SYMFONY__ENV__MAILER_DSN=smtp://bot%40chn.moe@${placeholder."mail/bot-urlencoded"}:mail.chn.moe
SYMFONY__ENV__MAILER_DSN=smtp://bot%%40chn.moe@${placeholder."mail/bot-encoded"}:mail.chn.moe
SYMFONY__ENV__FROM_EMAIL=bot@chn.moe
SYMFONY__ENV__TWOFACTOR_SENDER=bot@chn.moe
SYMFONY__ENV__DOMAIN_NAME=https://wallabag.chn.moe
@@ -1133,7 +1133,7 @@ inputs:
{
"redis/wallabag".owner = inputs.config.users.users.redis-wallabag.name;
"postgresql/wallabag" = {};
"mail/bot-urlencoded" = {};
"mail/bot-encoded" = {};
};
};
services =
@@ -1166,11 +1166,11 @@ inputs:
};
virtualization.docker.enable = true;
};
users =
{
users.wallabag = { isSystemUser = true; group = "wallabag"; autoSubUidGidRange = true; };
groups.wallabag = {};
};
# users =
# {
# users.wallabag = { isSystemUser = true; group = "wallabag"; autoSubUidGidRange = true; };
# groups.wallabag = {};
# };
}
)
];

6
secrets/vps7.yaml
View File

@@ -14,7 +14,7 @@ rsshub:
youtube-client-secret: ENC[AES256_GCM,data:c/ALpo/4qJdccMgYiSLg9ZgG7ddaMYxHwJYZ/ogJN2ED21k=,iv:CkrIq+Vpuq28CsRNwdKRLnBq6L8NF37y4xhhnmHQHqQ=,tag:SKtHpm/QZWnGViDtSKlUUQ==,type:str]
youtube-refresh-token: ENC[AES256_GCM,data:pnXQ1euCdix2H7IxudmUUcpxc2OUhciKT8OcGV89c/EpoXHgx1+eLxwY5rRszroWwjge9M001RGHngvD/ny3phfWAwYmIzMJxun2f7JCPe7ybMesWmPSkiqVBss1Zfic1uB8mNM/yw==,iv:8p8/vATY8F3YuGA1TtjekiuaKOMnQyTMjrwDBJaK4VU=,tag:/jVg9FDOuLMNrupgrywpBQ==,type:str]
mail:
bot-urlencoded: ENC[AES256_GCM,data:7a+4eEirG93MGq24vJ5emhJT,iv:SlwQ7jeOJqk07FZMi2WaK46JMncdl9FBTANpFytpm9c=,tag:PivQ3NRM+d4SK+oUAZChTQ==,type:str]
bot-encoded: ENC[AES256_GCM,data:HstqDfhKoLqDip9O+mwYGbNlNQ==,iv:CZSTfxJHhI6nG7501cQdJiZ9l3uKS7d5YsA8iVTUuoE=,tag:Rj3rvXJzDp8XzODV/gABog==,type:str]
sops:
kms: []
gcp_kms: []
@@ -39,8 +39,8 @@ sops:
SnFHS1Z0SXUzTFdEd29KTy9DU3Y3R0UKfhh+rUmWDrf+UGjclP57dHipPLFoXSqy
HdelmfV6q4/c7ppx2E+oZw3VNgoZCsrxxzYZfwxHJiZb+5vkE0D8iA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-08-15T07:11:16Z"
mac: ENC[AES256_GCM,data:f4DGqoZvhok8Hb38/B9Vi104TmSQ/UbBcy2KSZyQE1mC28DgWyLv4celLC8pJMqcxN41qA7y+qlV4niSTxAE6u8kp2OngujzGnogoI1KLvPXVC/VIIUHtzdByfuiZAO/Ev/AjYGdOCcloNsVpOAKja17yiefzKpXFtlwQb3KHCs=,iv:hLALBSquoypASbZcl/xSU6UCa/+8zH+ZFo4i49mqES4=,tag:aIcE0hsVHjHB33HjLbvzYA==,type:str]
lastmodified: "2023-08-15T08:22:03Z"
mac: ENC[AES256_GCM,data:8razKAEWufn3igL5bWo6N2y5G210V+Jw014BerTAfYvqpXUhrLP9NmDlp4dGwafGjfTmwpp+HuN4ZupIU9g+4ml+pVipViEVRAPbuWTA8sVCWT1kSmh1XOQA+3XIg3DwM2MfPMpdhVIvzDWaB1We2DoQy+ZUwgmaU5XwnlnCctQ=,iv:XszNLWFq08+aVkL+H/rEH12r2rbVMwcuJloUoq1n+1k=,tag:9C20v/n+Q+3CasArLu8XQg==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3