@ydkn/pulumi-components 0.9.2 → 0.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,7 +7,7 @@ export interface RedisArgs {
|
|
|
7
7
|
export interface BlockyArgs {
|
|
8
8
|
namespace?: pulumi.Input<string>;
|
|
9
9
|
nameservers?: pulumi.Input<pulumi.Input<string>[]>;
|
|
10
|
-
|
|
10
|
+
denylists?: pulumi.Input<{
|
|
11
11
|
[key: string]: pulumi.Input<pulumi.Input<string>[]>;
|
|
12
12
|
}>;
|
|
13
13
|
redis?: pulumi.Input<RedisArgs>;
|
package/lib/blocky/deployment.js
CHANGED
|
@@ -41,26 +41,31 @@ export class Blocky extends ComponentResource {
|
|
|
41
41
|
this.config = new k8s.core.v1.ConfigMap(name, {
|
|
42
42
|
metadata,
|
|
43
43
|
data: {
|
|
44
|
-
"config.yml": pulumi.all([args.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
44
|
+
"config.yml": pulumi.all([args.denylists, args.redis]).apply(([denylists, redis]) => yaml.dump({
|
|
45
|
+
log: {
|
|
46
|
+
level: "warn",
|
|
47
|
+
format: "json",
|
|
48
|
+
privacy: true,
|
|
49
|
+
},
|
|
50
|
+
ports: { dns: 53, tls: 853, http: 4000, https: 4443 },
|
|
51
|
+
upstreams: {
|
|
52
|
+
groups: { default: upstreamServers },
|
|
53
|
+
},
|
|
53
54
|
blocking: {
|
|
54
55
|
blockType: "nxDomain",
|
|
55
56
|
blockTTL: "6h",
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
57
|
+
denylists: denylists ?? {},
|
|
58
|
+
loading: {
|
|
59
|
+
downloads: {
|
|
60
|
+
attempts: 3,
|
|
61
|
+
cooldown: "2s",
|
|
62
|
+
timeout: "60s",
|
|
63
|
+
},
|
|
64
|
+
refreshPeriod: "4h",
|
|
65
|
+
strategy: "blocking",
|
|
66
|
+
concurrency: 4,
|
|
67
|
+
},
|
|
68
|
+
clientGroupsBlock: { default: Object.keys(denylists ?? []) },
|
|
64
69
|
},
|
|
65
70
|
caching: { prefetching: true },
|
|
66
71
|
redis: redis
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAmBhD,MAAM,OAAO,MAAO,SAAQ,iBAAiB;IAC1B,MAAM,CAAwB;IAC9B,UAAU,CAAyB;IACnC,OAAO,CAAwB;IAC/B,aAAa,CAAwB;IACrC,cAAc,CAAiB;IAC/B,gBAAgB,CAAY;IAC7B,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAgB,EAAE,IAAsC;QAChF,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;QAEpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAC/B,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAEnF,MAAM,QAAQ,GAAG;YACf,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,QAAQ;gBAClC,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CACrC,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":"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"}
|