diff --git a/.woodpecker.yml b/.woodpecker.yml index a713eef..a5c6981 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,13 +3,15 @@ steps: image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix profile install nixpkgs#gnused --impure + - sed -i "s|base_url = \"https://www.softinio.com\"|base_url = \"https://$CI_COMMIT_BRANCH.softinio.com\"|" ./config.toml - nix build - nix flake show - ls result - - nix develop --command wrangler pages deploy result --branch=$CI_COMMIT_SOURCE_BRANCH --project-name=softinio --commit-dirty=true + - nix develop --command wrangler pages deploy result --branch=$CI_COMMIT_BRANCH --project-name=softinio --commit-dirty=true secrets: [ cloudflare_account_id, cloudflare_api_token ] when: - event: [push, pull_request] + event: [push] branch: exclude: [ main ] diff --git a/config.toml b/config.toml index ad22981..7626d44 100644 --- a/config.toml +++ b/config.toml @@ -197,7 +197,7 @@ copyright = "© $CURRENT_YEAR $AUTHOR $SEPARATOR Unless otherwise noted, the con allowed_domains = [ { directive = "font-src", domains = ["'self'", "data:"] }, { directive = "img-src", domains = ["'self'", "https://*", "data:"] }, - { directive = "script-src", domains = ["'self'", "https://comments.softinio.com/js/embed.min.js", "https://static.cloudflareinsights.com/beacon.min.js"] }, + { directive = "script-src", domains = ["'self'", "https://comments.softinio.com/js/embed.min.js", "https://static.cloudflareinsights.com"] }, { directive = "style-src", domains = ["'self'"] }, { directive = "frame-src", domains = ["player.vimeo.com", "https://www.youtube-nocookie.com", "https://watch.softinio.com", "https://notes.softinio.com/embed"] }, ] diff --git a/flake.nix b/flake.nix index f68a449..2832b3d 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ ln -snf "${theme}" "themes/${themeName}" ''; buildPhase = '' - zola build + zola build -f ''; installPhase = '' mkdir -p $out diff --git a/static/_headers b/static/_headers index 063c000..1e14ac6 100644 --- a/static/_headers +++ b/static/_headers @@ -1,5 +1,3 @@ -https://comments.softinio.com - Access-Control-Allow-Origin: https://comments.softinio.com -https://www.softinio.com - Access-Control-Allow-Origin: https://www.softinio.com +/* + Access-Control-Allow-Origin: https://www.softinio.com https://comments.softinio.com https://*.softinio.pages.dev