Pārlūkot izejas kodu

Added METRICS_ALLOWED_IP_ADDRESSES settings to Docker/Snap/Source https://github.com/wekan/wekan/wiki/Metrics .

Thanks to xet7 !

Related https://github.com/wekan/wekan/pull/4700
Lauri Ojansivu 2 gadi atpakaļ
vecāks
revīzija
34862810df

+ 1 - 0
Dockerfile

@@ -57,6 +57,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     MATOMO_SITE_ID="" \
     MATOMO_DO_NOT_TRACK=true \
     MATOMO_WITH_USERNAME=false \
+    METRICS_ALLOWED_IP_ADDRESSES="" \
     BROWSER_POLICY_ENABLED=true \
     TRUSTED_URL="" \
     WEBHOOKS_ATTRIBUTES="" \

+ 4 - 0
docker-compose.yml

@@ -347,6 +347,10 @@ services:
       # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
       #- TRUSTED_URL=https://intra.example.com
       #-----------------------------------------------------------------
+      # ==== METRICS ALLOWED IP ADDRESSES ====
+      # https://github.com/wekan/wekan/wiki/Metrics
+      #- METRICS_ALLOWED_IP_ADDRESSES=192.168.0.100,192.168.0.200
+      #-----------------------------------------------------------------
       # ==== OUTGOING WEBHOOKS ====
       # What to send to Outgoing Webhook, or leave out. If commented out the default values will be: cardId,listId,oldListId,boardId,comment,user,card,commentId,swimlaneId,customerField,customFieldValue
       #- WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
snap-src/bin/config


+ 25 - 0
snap-src/bin/wekan-help

@@ -206,6 +206,31 @@ echo -e "\t$ snap set $SNAP_NAME cors-expose-headers='*'"
 echo -e "\t-Disable the Set Access-Control-Expose-Headers header.  This is not needed for typical CORS situations. Example: ''"
 echo -e "\t$ snap unset $SNAP_NAME cors-expose-headers"
 echo -e "\n"
+echo -e "The address of the server where Matomo is hosted:"
+echo -e "\t$ snap set $SNAP_NAME matomo-address='https://matomo.example.com'"
+echo -e "\t-Disable the Matomo integration:"
+echo -e "\t$ snap unset $SNAP_NAME matomo-address"
+echo -e "\n"
+echo -e "The value of the site ID given in matomo server"
+echo -e "\t$ snap set $SNAP_NAME matomo-site-id='12345'"
+echo -e "\t-Disable the Matomo site id integration:"
+echo -e "\t$ snap unset $SNAP_NAME matomo-site-id"
+echo -e "\n"
+echo -e "The option do not track which enables users to not be tracked by matomo. Default: true"
+echo -e "\t$ snap set $SNAP_NAME matomo-do-not-track='true'"
+echo -e "\t-Disable the Matomo do not track:"
+echo -e "\t$ snap unset $SNAP_NAME matomo-do-not-track"
+echo -e "\n"
+echo -e "The option that allows matomo to retrieve the username. Default: false"
+echo -e "\t$ snap set $SNAP_NAME matomo-with-username='true'"
+echo -e "\t-Do not retrieve username:"
+echo -e "\t$ snap set $SNAP_NAME matomo-with-username='false'"
+echo -e "\n"
+echo -e "Metrics allowed IP addresses, separated by ',' . https://github.com/wekan/wekan/wiki/Metrics"
+echo -e "\t$ snap set $SNAP_NAME metrics-allowed-ip-addresses='192.168.0.100,192.168.0.200'"
+echo -e "\t-Disable the Metrics:"
+echo -e "\t$ snap unset $SNAP_NAME metrics-allowed-ip-addresses"
+echo -e "\n"
 echo -e "Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside."
 echo -e "\t\t Setting this to false is not recommended, it also disables all other browser policy protections"
 echo -e "\t\t and allows all iframing etc. See wekan/server/policy.js"

+ 4 - 0
start-wekan.bat

@@ -112,6 +112,10 @@ REM # The address of the server where Matomo is hosted.
 REM # example: - MATOMO_ADDRESS=https://example.com/matomo
 REM SET MATOMO_ADDRESS=
 
+REM # ==== METRICS ALLOWED IP ADDRESSES ====
+REM # https://github.com/wekan/wekan/wiki/Metrics
+REM SET METRICS_ALLOWED_IP_ADDRESSES=192.168.0.100,192.168.0.200
+
 REM # The value of the site ID given in Matomo server for Wekan
 REM # example: - MATOMO_SITE_ID=12345
 REM SET MATOMO_SITE_ID=

+ 4 - 0
start-wekan.sh

@@ -135,6 +135,10 @@
       # Example: export MATOMO_WITH_USERNAME=true
       #export MATOMO_WITH_USERNAME='false'
       #---------------------------------------------
+      # ==== METRICS ALLOWED IP ADDRESSES ====
+      # https://github.com/wekan/wekan/wiki/Metrics
+      #export METRICS_ALLOWED_IP_ADDRESSES=192.168.0.100,192.168.0.200
+      #-----------------------------------------------------------------
       # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
       # Setting this to false is not recommended, it also disables all other browser policy protections
       # and allows all iframing etc. See wekan/server/policy.js

+ 4 - 0
torodb-postgresql/docker-compose.yml

@@ -348,6 +348,10 @@ services:
       # example: MATOMO_WITH_USERNAME=true
       #- MATOMO_WITH_USERNAME=false
       #-----------------------------------------------------------------
+      # ==== METRICS ALLOWED IP ADDRESSES ====
+      # https://github.com/wekan/wekan/wiki/Metrics
+      #- METRICS_ALLOWED_IP_ADDRESSES=192.168.0.100,192.168.0.200
+      #-----------------------------------------------------------------
       # ==== BROWSER POLICY AND TRUSTED IFRAME URL ====
       # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
       # Setting this to false is not recommended, it also disables all other browser policy protections

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels