Undo erroneous case fold

2024-07-04 18:32:04 -07:00 · 2024-07-04 18:32:04 -07:00 · 08d565bdd1
commit 08d565bdd1
parent 63c0683855
1 changed files with 134 additions and 134 deletions
--- a/compose.yml
+++ b/compose.yml
@ -5,7 +5,7 @@ services:
  app:
    image: yakumosaki/glitch-soc:latest 
    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
-    networks: &bothnetworks
+    networks: &bothNetworks
      - proxy
      - internal_network
    deploy:
@ -15,11 +15,11 @@ services:
      labels:
        - "traefik.enable=true"
        - "traefik.docker.network=proxy"
-        - "traefik.http.services.${stack_name}_web.loadbalancer.server.port=3000"
-        - "traefik.http.routers.${stack_name}_web.rule=host(`${domain}`)"
-        - "traefik.http.routers.${stack_name}_web.entrypoints=web-secure"
-        - "traefik.http.routers.${stack_name}_web.tls.certresolver=${lets_encrypt_env}"
-        - "coop-cloud.${stack_name}.version=0.1.0+latest"
+        - "traefik.http.services.${STACK_NAME}_web.loadbalancer.server.port=3000"
+        - "traefik.http.routers.${STACK_NAME}_web.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}_web.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}_web.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "coop-cloud.${STACK_NAME}.version=0.1.0+latest"
    configs: &configs
      - source: entrypoint_sh
        target: /usr/local/bin/entrypoint.sh
@ -31,7 +31,7 @@ services:
    #healthcheck:
    #
    # broken with authorized fetch and limited fed apparently
-    # test: ["cmd-shell", "wget -q --spider --header 'x-forwarded-proto: https' --proxy=off localhost:3000/api/v1/instance || exit 1"]
+    # test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy=off localhost:3000/api/v1/instance || exit 1"]
    secrets: &secrets
      - db_password
      - otp_secret
@ -42,131 +42,131 @@ services:
      - active_rec_salt
      - active_rec_prim_key
    environment: &env
-      - allow_access_to_hidden_service
-      - alternate_domains
-      - authorized_fetch
-      - cache_redis_host
-      - cache_redis_namespace
-      - cache_redis_port
-      - cache_redis_url
-      - db_host
-      - db_name
-      - db_pass_file=/run/secrets/db_password
-      - db_port
-      - db_user
-      - default_locale
-      - email_domain_allowlist
-      - email_domain_denylist
-      - es_enabled
-      - es_host
-      - es_port
-      - ldap_base
-      - ldap_bind_dn
-      - ldap_enabled
-      - ldap_host
-      - ldap_mail
-      - ldap_method
-      - ldap_password
-      - ldap_port
-      - ldap_search_filter
-      - ldap_uid
-      - ldap_uid_converstion_enabled
-      - limited_federation_mode
-      - local_domain
-      - max_bio_chars
-      - max_display_name_chars
-      - max_emoji_size
-      - max_image_size
-      - max_pinned_toots
-      - max_poll_options
-      - max_poll_option_chars
-      - max_profile_fields
-      - max_remote_emoji_size
-      - max_search_results
-      - max_session_activations
-      - max_toot_chars
-      - max_trending_tags
-      - max_video_size
-      - oauth_redirect_at_sign_in
-      - oidc_auth_endpoint
-      - oidc_client_auth_method
-      - oidc_client_id
-      - oidc_client_secret_file=/run/secrets/oidc_client_secret
-      - oidc_discovery
-      - oidc_display
-      - oidc_display_name
-      - oidc_enabled
-      - oidc_end_session_endpoint
-      - oidc_host
-      - oidc_idp_logout_redirect_uri
-      - oidc_issuer
-      - oidc_jwks_uri
-      - oidc_port
-      - oidc_prompt
-      - oidc_redirect_uri
-      - oidc_response_mode
-      - oidc_response_type
-      - oidc_scope
-      - oidc_security_assume_email_is_verified
-      - oidc_send_nonce
-      - oidc_send_scope_to_token_endpoint
-      - oidc_token_endpoint
-      - oidc_uid_field
-      - oidc_user_info_endpoint
-      - otp_secret_file=/run/secrets/otp_secret
-      - paperclip_root_path
-      - paperclip_root_url
-      - rails_env
-      - rails_serve_static_files
-      - redis_host
-      - redis_namespace
-      - redis_port
-      - redis_url
-      - saml_acs_url
-      - saml_attributes_statements_email
-      - saml_attributes_statements_first_name
-      - saml_attributes_statements_full_name
-      - saml_attributes_statements_last_name
-      - saml_attributes_statements_uid
-      - saml_attributes_statements_verified
-      - saml_attributes_statements_verified_email
-      - saml_cert
-      - saml_enabled
-      - saml_idp_cert
-      - saml_idp_cert_fingerprint
-      - saml_idp_sso_target_url
-      - saml_issuer
-      - saml_name_identifier_format
-      - saml_private_key
-      - saml_security_assume_email_is_verified
-      - saml_security_want_assertion_encrypted
-      - saml_security_want_assertion_signed
-      - saml_uid_attribute
-      - secret_key_base_file=/run/secrets/secret_key_base
-      - single_user_mode
-      - smtp_auth_method
-      - smtp_ca_file
-      - smtp_delivery_method
-      - smtp_domain
-      - smtp_enable_starttls_auto
-      - smtp_from_address
-      - smtp_login
-      - smtp_openssl_verify_mode
-      - smtp_password_file=/run/secrets/smtp_password
-      - smtp_port
-      - smtp_server
-      - smtp_ssl
-      - smtp_tls
-      - statsd_addr
-      - statsd_namespace
-      - trusted_proxy_ip
-      - user_active_days
-      - vapid_private_key_file=/run/secrets/vapid_private_key
-      - vapid_public_key
-      - web_domain
-      - active_record_encryption_deterministic_key_file=/run/secrets/active_rec_det_key
-      - active_record_encryption_key_derivation_salt_file=/run/secrets/active_rec_salt
-      - active_record_encryption_primary_key_file=/run/secrets/active_rec_prim_key
+      - ALLOW_ACCESS_TO_HIDDEN_SERVICE
+      - ALTERNATE_DOMAINS
+      - AUTHORIZED_FETCH
+      - CACHE_REDIS_HOST
+      - CACHE_REDIS_NAMESPACE
+      - CACHE_REDIS_PORT
+      - CACHE_REDIS_URL
+      - DB_HOST
+      - DB_NAME
+      - DB_PASS_FILE=/run/secrets/db_password
+      - DB_PORT
+      - DB_USER
+      - DEFAULT_LOCALE
+      - EMAIL_DOMAIN_ALLOWLIST
+      - EMAIL_DOMAIN_DENYLIST
+      - ES_ENABLED
+      - ES_HOST
+      - ES_PORT
+      - LDAP_BASE
+      - LDAP_BIND_DN
+      - LDAP_ENABLED
+      - LDAP_HOST
+      - LDAP_MAIL
+      - LDAP_METHOD
+      - LDAP_PASSWORD
+      - LDAP_PORT
+      - LDAP_SEARCH_FILTER
+      - LDAP_UID
+      - LDAP_UID_CONVERSTION_ENABLED
+      - LIMITED_FEDERATION_MODE
+      - LOCAL_DOMAIN
+      - MAX_BIO_CHARS
+      - MAX_DISPLAY_NAME_CHARS
+      - MAX_EMOJI_SIZE
+      - MAX_IMAGE_SIZE
+      - MAX_PINNED_TOOTS
+      - MAX_POLL_OPTIONS
+      - MAX_POLL_OPTION_CHARS
+      - MAX_PROFILE_FIELDS
+      - MAX_REMOTE_EMOJI_SIZE
+      - MAX_SEARCH_RESULTS
+      - MAX_SESSION_ACTIVATIONS
+      - MAX_TOOT_CHARS
+      - MAX_TRENDING_TAGS
+      - MAX_VIDEO_SIZE
+      - OAUTH_REDIRECT_AT_SIGN_IN
+      - OIDC_AUTH_ENDPOINT
+      - OIDC_CLIENT_AUTH_METHOD
+      - OIDC_CLIENT_ID
+      - OIDC_CLIENT_SECRET_FILE=/run/secrets/oidc_client_secret
+      - OIDC_DISCOVERY
+      - OIDC_DISPLAY
+      - OIDC_DISPLAY_NAME
+      - OIDC_ENABLED
+      - OIDC_END_SESSION_ENDPOINT
+      - OIDC_HOST
+      - OIDC_IDP_LOGOUT_REDIRECT_URI
+      - OIDC_ISSUER
+      - OIDC_JWKS_URI
+      - OIDC_PORT
+      - OIDC_PROMPT
+      - OIDC_REDIRECT_URI
+      - OIDC_RESPONSE_MODE
+      - OIDC_RESPONSE_TYPE
+      - OIDC_SCOPE
+      - OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED
+      - OIDC_SEND_NONCE
+      - OIDC_SEND_SCOPE_TO_TOKEN_ENDPOINT
+      - OIDC_TOKEN_ENDPOINT
+      - OIDC_UID_FIELD
+      - OIDC_USER_INFO_ENDPOINT
+      - OTP_SECRET_FILE=/run/secrets/otp_secret
+      - PAPERCLIP_ROOT_PATH
+      - PAPERCLIP_ROOT_URL
+      - RAILS_ENV
+      - RAILS_SERVE_STATIC_FILES
+      - REDIS_HOST
+      - REDIS_NAMESPACE
+      - REDIS_PORT
+      - REDIS_URL
+      - SAML_ACS_URL
+      - SAML_ATTRIBUTES_STATEMENTS_EMAIL
+      - SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME
+      - SAML_ATTRIBUTES_STATEMENTS_FULL_NAME
+      - SAML_ATTRIBUTES_STATEMENTS_LAST_NAME
+      - SAML_ATTRIBUTES_STATEMENTS_UID
+      - SAML_ATTRIBUTES_STATEMENTS_VERIFIED
+      - SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL
+      - SAML_CERT
+      - SAML_ENABLED
+      - SAML_IDP_CERT
+      - SAML_IDP_CERT_FINGERPRINT
+      - SAML_IDP_SSO_TARGET_URL
+      - SAML_ISSUER
+      - SAML_NAME_IDENTIFIER_FORMAT
+      - SAML_PRIVATE_KEY
+      - SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED
+      - SAML_SECURITY_WANT_ASSERTION_ENCRYPTED
+      - SAML_SECURITY_WANT_ASSERTION_SIGNED
+      - SAML_UID_ATTRIBUTE
+      - SECRET_KEY_BASE_FILE=/run/secrets/secret_key_base
+      - SINGLE_USER_MODE
+      - SMTP_AUTH_METHOD
+      - SMTP_CA_FILE
+      - SMTP_DELIVERY_METHOD
+      - SMTP_DOMAIN
+      - SMTP_ENABLE_STARTTLS_AUTO
+      - SMTP_FROM_ADDRESS
+      - SMTP_LOGIN
+      - SMTP_OPENSSL_VERIFY_MODE
+      - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
+      - SMTP_PORT
+      - SMTP_SERVER
+      - SMTP_SSL
+      - SMTP_TLS
+      - STATSD_ADDR
+      - STATSD_NAMESPACE
+      - TRUSTED_PROXY_IP
+      - USER_ACTIVE_DAYS
+      - VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key
+      - VAPID_PUBLIC_KEY
+      - WEB_DOMAIN
+      - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_FILE=/run/secrets/active_rec_det_key
+      - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_FILE=/run/secrets/active_rec_salt
+      - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_FILE=/run/secrets/active_rec_key

  streaming:
    image: yakumosaki/glitch-soc:latest
@ -174,7 +174,7 @@ services:
    configs: *configs
    entrypoint: *entrypoint
    secrets: *secrets
-    networks: *bothnetworks
+    networks: *bothNetworks
    deploy:
      update_config:
        failure_action: rollback
@ -199,7 +199,7 @@ services:
      update_config:
        failure_action: rollback
        order: start-first
-    networks: *bothnetworks
+    networks: *bothNetworks
    volumes: *appVolume
    environment: *env