From 59ea1238d9e5ee24fd6cb1a35057efe101a87c9e Mon Sep 17 00:00:00 2001 From: Max Mehl Date: Wed, 10 Jan 2024 16:23:02 +0100 Subject: [PATCH] fix matomo proxy config --- .gitea/workflows/hugo.yaml | 7 +++++++ themes/hugo-sustain/static/config.php.sample | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/hugo.yaml b/.gitea/workflows/hugo.yaml index db55b4f..299739c 100644 --- a/.gitea/workflows/hugo.yaml +++ b/.gitea/workflows/hugo.yaml @@ -33,6 +33,13 @@ jobs: submodules: recursive # Get submdules fetch-depth: 1 # Fetch all history for .GitInfo and .Lastmod + - name: Create configuration for Matomo + run: | + cp themes/hugo-sustain/static/config.php.sample static/config.php + sed -i "s|__PIWIK_URL__|${{ secrets.MATOMO_PIWIK_URL }}|" static/config.php + sed -i "s|__PROXY_URL__|${{ secrets.MATOMO_PROXY_URL }}|" static/config.php + sed -i "s|__TOKEN_AUTH__|${{ secrets.MATOMO_TOKEN_AUTH }}|" static/config.php + - name: Setup Hugo uses: https://github.com/peaceiris/actions-hugo@v2.6.0 with: diff --git a/themes/hugo-sustain/static/config.php.sample b/themes/hugo-sustain/static/config.php.sample index 9a210a9..c332697 100644 --- a/themes/hugo-sustain/static/config.php.sample +++ b/themes/hugo-sustain/static/config.php.sample @@ -8,16 +8,16 @@ // Edit the line below, and replace http://your-matomo-domain.example.org/matomo/ // with your Matomo URL ending with a slash. // This URL will never be revealed to visitors or search engines. -$PIWIK_URL = 'http://your-matomo-domain.example.org/matomo/'; +$PIWIK_URL = '__PIWIK_URL__'; // Edit the line below and replace http://your-tracker-proxy.org/ with the URL to your tracker-proxy // setup. This URL will be used in Matomo output that contains the Matomo URL, so your Matomo is effectively // hidden. -$PROXY_URL = 'http://your-tracker-proxy.org/'; +$PROXY_URL = '__PROXY_URL__'; // Edit the line below, and replace xyz by the token_auth for the user "UserTrackingAPI" // which you created when you followed instructions above. -$TOKEN_AUTH = 'xyz'; +$TOKEN_AUTH = '__TOKEN_AUTH__'; // Maximum time, in seconds, to wait for the Matomo server to return the 1*1 GIF $timeout = 5; @@ -29,7 +29,7 @@ $user_agent = ''; // In some situations the backend takes the sending IP address into account // which by default is the IP address of the server/service proxy.php is executed from. // If $http_forward_header is set, the clients IP address is sent over in the -// header field with the given name. An empty string means do not send the header. +// header field with the given name. An empty string means do not send the header. // A common header name is 'X-Forwarded-For'. // // In order to work, the http server serving the matomo instance, has to be configured