fix netlify notification of mixed content

garbas · garbas · commit e25fda7eafa8 · 2020-04-11T02:53:08.000+02:00
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Installing Nix
       uses: cachix/install-nix-action@v8
     - name: Building planet.nixos.org
-      run: nix-shell -p venus --command "venus-planet planet.ini"
+      run: nix-shell --run "venus-planet planet.ini && fix.sh"
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.0.5
       env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Installing Nix
       uses: cachix/install-nix-action@v8
     - name: Building planet.nixos.org
-      run: nix-shell -p venus --command "venus-planet planet.ini"
+      run: nix-shell --run "venus-planet planet.ini && fix.sh"
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.0.5
       env:
diff --git a/README.md b/README.md
@@ -22,3 +22,18 @@ link = https://example.com
 
 - send pull request
 
+## Developing
+
+- In one terminal window run:
+
+  ```
+  $ nix-shell --run "git ls-files | entr -s 'venus-planet planet.ini'"`
+  ```
+
+  Have some patience initial so that cache of blogs builds up.
+
+- In the other terminal window run:
+
+  ```
+  $ nix-shell --run "cd dist && python -m http.server"
+  ```
diff --git a/default.nix b/default.nix
@@ -0,0 +1,6 @@
+{ pkgs ? import <nixpkgs> {}
+}:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [ venus entr python3 ];
+}
diff --git a/fix.sh b/fix.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed -i -e 's|"http://|"https://|g' dist/index.html
diff --git a/theme/index.html.tmpl b/theme/index.html.tmpl
@@ -108,18 +108,6 @@ Powered by:<br>
 <a href="http://www.planetplanet.org/"><img src="images/planet.png" width="80" height="15" alt="Planet" border="0"></a>
 </p>
 
-<p>
-<h2>Planetarium:</h2>
-<ul>
-<li><a href="http://www.planetapache.org/">Planet Apache</a></li>
-<li><a href="http://planet.freedesktop.org/">Planet freedesktop.org</a></li>
-<li><a href="http://planet.gnome.org/">Planet GNOME</a></li>
-<li><a href="http://planet.debian.net/">Planet Debian</a></li>
-<li><a href="http://planet.fedoraproject.org/">Planet Fedora</a></li>
-<li><a href="http://planets.sun.com/">Planet Sun</a></li>
-<li><a href="http://www.planetplanet.org/">more...</a></li>
-</ul>
-</p>
 </div>
 </body>
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/sh`
	`2`	`+`
	`3`	`+sed -i -e 's\|"http://\|"https://\|g' dist/index.html`