Commit 2f44ded6 authored by Carlos Torres's avatar Carlos Torres
Browse files

Updating the variables to take into account user3 lux ot light and the latest sc_pack version.

parent 4201c1d2
......@@ -38,6 +38,8 @@ deployments:
images_optimization_with_aws: False
enable_usher3: False
usher3_max_overhead: 1.0
usher3_toilmore_subservice: light # light or lux
usher3_toilmore_api_version: 2020.1 # if light 2020.1, if lux 2020.4
google_recaptcha_site_key: <your_google_recaptcha_site_key>
google_recaptcha_site_secret: <your_google_recaptcha_site_secret>
transit_encryption_key: <your_transit_encryption_key>
......@@ -53,6 +55,8 @@ deployments:
images_optimization_with_aws: False
enable_usher3: False
usher3_max_overhead: 1.0
usher3_toilmore_subservice: light # light or lux
usher3_toilmore_api_version: 2020.1 # if light 2020.1, if lux 2020.4
google_recaptcha_site_key: <your_google_recaptcha_site_key>
google_recaptcha_site_secret: <your_google_recaptcha_site_secret>
transit_encryption_key: <your_transit_encryption_key>
......
......@@ -11,15 +11,7 @@ shimmercat-devlove:
connect-to: "127.0.0.1:4430"
application-protocol: http
encryption-level: plain
{% if item.value.enable_bots_blocking == true %}
bots:
connect-to: 127.0.0.1:{{item.value.humanity_validator_port}}
application-protocol: http
bot-protection-enabled: true
{% endif %}
{% if item.value.enable_bots_blocking == false %}
bot-protection-enabled: false
{% endif %}
haps-settings:
enabled: true
image-cdn: true
......
......@@ -10,10 +10,7 @@ shimmercat-devlove:
connect-to: "127.0.0.1:4430"
application-protocol: http
encryption-level: plain
bots:
connect-to: 127.0.0.1:8040
application-protocol: http
bot-protection-enabled: true
bot-protection-enabled: false
haps-settings:
enabled: true
image-cdn: true
......@@ -21,10 +18,10 @@ shimmercat-devlove:
change-url:
- /.well-known//+/ -> <*>
- /.well-known//+ -> <*>
- //+</\.(js|css|ico|jpeg|jpg|png|gif|bmp|txt|svg|woff2|woff|ttf|json)/> -> <*>
- / -> /target/+common/
- //+/ -> /target/+common/slash/<+>
- //+ -> /target/+common/no-slash/<+>/
- //+</\.(js|css|ico|jpeg|jpg|png|gif|bmp|txt|svg|woff2|woff|ttf|json|otf)/> -> generated /pull-image/<+>/
#- / -> /target/+common/
#- //+/ -> /target/+common/slash/<+>
#- //+ -> /target/+common/no-slash/<+>/
cache-key: abcd
changelist-settings:
tOld: 1209600
......
......@@ -10,7 +10,10 @@ shimmercat-devlove:
connect-to: "127.0.0.1:4430"
application-protocol: http
encryption-level: plain
bot-protection-enabled: false
bots:
connect-to: 127.0.0.1:8040
application-protocol: http
bot-protection-enabled: true
haps-settings:
enabled: true
image-cdn: true
......@@ -18,10 +21,10 @@ shimmercat-devlove:
change-url:
- /.well-known//+/ -> <*>
- /.well-known//+ -> <*>
- //+</\.(js|css|ico|jpeg|jpg|png|gif|bmp|txt|svg|woff2|woff|ttf|json)/> -> <*>
- / -> /target/+common/
- //+/ -> /target/+common/slash/<+>
- //+ -> /target/+common/no-slash/<+>/
- //+</\.(js|css|ico|jpeg|jpg|png|gif|bmp|txt|svg|woff2|woff|ttf|json|otf)/> -> generated /pull-image/<+>/
#- / -> /target/+common/
#- //+/ -> /target/+common/slash/<+>
#- //+ -> /target/+common/no-slash/<+>/
cache-key: abcd
changelist-settings:
tOld: 1209600
......
......@@ -31,3 +31,10 @@ transit_encryption_key: {{item.value.transit_encryption_key}}
images_optimization_with_aws: {{item.value.images_optimization_with_aws}}
enable_usher3: {{item.value.enable_usher3}}
usher3_max_overhead: {{item.value.usher3_max_overhead}}
usher3_toilmore_subservice: {{item.value.usher3_toilmore_subservice}}
usher3_lux_adjustments:
master: {}
shifter: {}
encoder:
max_overhead: {{item.value.usher3_max_overhead}}
usher3_toilmore_api_version: "{{item.value.usher3_toilmore_api_version}}"
......@@ -31,3 +31,10 @@ transit_encryption_key: {{item.value.transit_encryption_key}}
images_optimization_with_aws: {{item.value.images_optimization_with_aws}}
enable_usher3: {{item.value.enable_usher3}}
usher3_max_overhead: {{item.value.usher3_max_overhead}}
usher3_toilmore_subservice: {{item.value.usher3_toilmore_subservice}}
usher3_lux_adjustments:
master: {}
shifter: {}
encoder:
max_overhead: {{item.value.usher3_max_overhead}}
usher3_toilmore_api_version: "{{item.value.usher3_toilmore_api_version}}"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment