Show More
@@ -2739,7 +2739,7 b' rcstack_init_command() {' | |||||
2739 | echo "bootstrap_config: init runtime env config at: $BOOTSTRAP_RUNTIME_ENV" |
|
2739 | echo "bootstrap_config: init runtime env config at: $BOOTSTRAP_RUNTIME_ENV" | |
2740 |
|
2740 | |||
2741 | # Make runtime file |
|
2741 | # Make runtime file | |
2742 |
echo "## BOOTSTRAP GENERATED $(date) ##" > |
|
2742 | echo "## BOOTSTRAP GENERATED $(date) ##" > $BOOTSTRAP_RUNTIME_ENV | |
2743 | echo "" >> $BOOTSTRAP_RUNTIME_ENV |
|
2743 | echo "" >> $BOOTSTRAP_RUNTIME_ENV | |
2744 |
|
2744 | |||
2745 | cat $BOOTSTRAP_TMPL >> $BOOTSTRAP_RUNTIME_ENV |
|
2745 | cat $BOOTSTRAP_TMPL >> $BOOTSTRAP_RUNTIME_ENV | |
@@ -2777,10 +2777,12 b' rcstack_init_command() {' | |||||
2777 |
|
2777 | |||
2778 | .env set RC_LOKI_AUTH=loki-auth:$shared_key@ |
|
2778 | .env set RC_LOKI_AUTH=loki-auth:$shared_key@ | |
2779 |
|
2779 | |||
|
2780 | .env puts '' | |||
2780 | .env puts '# Log formatter option' |
|
2781 | .env puts '# Log formatter option' | |
2781 | .env set RC_LOGGING_FORMATTER=$log_formatter |
|
2782 | .env set RC_LOGGING_FORMATTER=$log_formatter | |
2782 | .env set RC_USE_CELERY=true |
|
2783 | .env set RC_USE_CELERY=true | |
2783 |
|
2784 | |||
|
2785 | .env puts '' | |||
2784 | .env puts '# Channelstream config' |
|
2786 | .env puts '# Channelstream config' | |
2785 | .env set RC_CHANNELSTREAM_SERVER=channelstream:8000 |
|
2787 | .env set RC_CHANNELSTREAM_SERVER=channelstream:8000 | |
2786 |
|
2788 | |||
@@ -2794,14 +2796,20 b' rcstack_init_command() {' | |||||
2794 |
|
2796 | |||
2795 | .env set CHANNELSTREAM_ALLOW_POSTING_FROM=0.0.0.0 |
|
2797 | .env set CHANNELSTREAM_ALLOW_POSTING_FROM=0.0.0.0 | |
2796 |
|
2798 | |||
|
2799 | .env puts '' | |||
2797 | .env puts '# Channelstream secrets' |
|
2800 | .env puts '# Channelstream secrets' | |
2798 | .env set CHANNELSTREAM_SECRET=$shared_key |
|
2801 | .env set CHANNELSTREAM_SECRET=$shared_key | |
2799 | .env set RC_CHANNELSTREAM_SECRET=$shared_key |
|
2802 | .env set RC_CHANNELSTREAM_SECRET=$shared_key | |
2800 |
|
2803 | |||
|
2804 | .env puts '' | |||
2801 | .env puts '# Channelstream admin' |
|
2805 | .env puts '# Channelstream admin' | |
2802 | .env set CHANNELSTREAM_ADMIN_SECRET=$shared_key |
|
2806 | .env set CHANNELSTREAM_ADMIN_SECRET=$shared_key | |
2803 | .env set RC_CHANNELSTREAM_ADMIN_SECRET=$shared_key |
|
2807 | .env set RC_CHANNELSTREAM_ADMIN_SECRET=$shared_key | |
2804 |
|
2808 | |||
|
2809 | .env puts '' | |||
|
2810 | .env puts '# SSH PORT' | |||
|
2811 | .env set RC_SSH_PORT=9022 | |||
|
2812 | ||||
2805 | ini_path=$INI_TARGET/vcsserver.ini |
|
2813 | ini_path=$INI_TARGET/vcsserver.ini | |
2806 | config_vcsserver_ini |
|
2814 | config_vcsserver_ini | |
2807 |
|
2815 | |||
@@ -2895,6 +2903,15 b' rcstack_init_command() {' | |||||
2895 | metrics_replace '# # Enable http\+https' ' # Enable http\+https' |
|
2903 | metrics_replace '# # Enable http\+https' ' # Enable http\+https' | |
2896 | metrics_replace '# - "traefik.http.routers.grafana.entrypoints=http,https"' ' - "traefik.http.routers.grafana.entrypoints=http,https"' |
|
2904 | metrics_replace '# - "traefik.http.routers.grafana.entrypoints=http,https"' ' - "traefik.http.routers.grafana.entrypoints=http,https"' | |
2897 |
|
2905 | |||
|
2906 | services_replace() { | |||
|
2907 | services_tmpl=$target_dir/docker-compose-services.override.yaml | |||
|
2908 | sed_func "$1" "$2" "$services_tmpl" | |||
|
2909 | } | |||
|
2910 | ||||
|
2911 | services_replace '# # Enable http\+https' ' # Enable http\+https' | |||
|
2912 | services_replace '# - "traefik.http.routers.channelstream.entrypoints=http,https"' ' - "traefik.http.routers.channelstream.entrypoints=http,https"' | |||
|
2913 | services_replace '# - "traefik.http.routers.nginx-statics.entrypoints=http,https"' ' - "traefik.http.routers.nginx-statics.entrypoints=http,https"' | |||
|
2914 | ||||
2898 | apps_replace() { |
|
2915 | apps_replace() { | |
2899 | apps_tmpl=$target_dir/docker-compose-apps.override.yaml |
|
2916 | apps_tmpl=$target_dir/docker-compose-apps.override.yaml | |
2900 | sed_func "$1" "$2" "$apps_tmpl" |
|
2917 | sed_func "$1" "$2" "$apps_tmpl" | |
@@ -7230,7 +7247,7 b' rcstack__completions_parse_requirements() {' | |||||
7230 |
|
7247 | |||
7231 | # :command.initialize |
|
7248 | # :command.initialize | |
7232 | initialize() { |
|
7249 | initialize() { | |
7233 |
version="5. |
|
7250 | version="5.4.0" | |
7234 | long_usage='' |
|
7251 | long_usage='' | |
7235 | set -e |
|
7252 | set -e | |
7236 |
|
7253 |
@@ -30,7 +30,10 b' services:' | |||||
30 | replicas: 1 |
|
30 | replicas: 1 | |
31 |
|
31 | |||
32 | nginx-statics: |
|
32 | nginx-statics: | |
33 | {} |
|
33 | labels: | |
|
34 | - "traefik.enable=true" | |||
|
35 | # # Enable http+https endpoints to serve SSL, select just 1 to disable the other | |||
|
36 | # - "traefik.http.routers.nginx-statics.entrypoints=http,https" | |||
34 |
|
37 | |||
35 | channelstream: |
|
38 | channelstream: | |
36 | labels: |
|
39 | labels: |
General Comments 0
You need to be logged in to leave comments.
Login now