~dvko/www.dutchfirecalc.nl: update deployment script to not pull from git directly (but push from dev)

3 files changed, 17 insertions(+), 9 deletions(-)

M deploy.sh
M public/data.csv
M templates/base.html.tera

M deploy.sh => deploy.sh +11 -4

@@ 1,12 1,19 @@
 #!/usr/bin/env bash
-
 set -e
 
+echo "Fetching latest Shiller data"
 bin/fetch_latest_data.py
 
-ssh -t dutchfirecalc@s1.dvk.co "\
-    cd ~/dutchfirecalc.nl; \
-    git pull -X theirs; \
+REMOTE="dutchfirecalc@s1.dvk.co"
+REMOTE_DIR="~/dutchfirecalc.nl"
+
+echo "Sending files to remote"
+rsync -q -u -r . "$REMOTE:$REMOTE_DIR" --exclude='/.git' --filter="dir-merge,- .gitignore"
+
+# we rebuild on the remote because libc is outdated and the only way to fix is to update Ubuntu to a new major release
+echo "Rebuilding on remote"
+ssh -t $REMOTE "\
+    cd $REMOTE_DIR; \
     source ~/.cargo/env; \
     cargo build --release; \
     sudo systemctl restart dutchfirecalc; \

M public/data.csv => public/data.csv +3 -2

@@ 1819,5 1819,6 @@ Date,P,D,CPI
 2022-06-01,3898.9466666666676,64.02,296.311
 2022-07-01,3911.729499999999,64.4527684478357,296.276
 2022-08-01,4158.5630434782615,64.8855368956714,296.171
-2022-09-01,3850.520476190475,65.31830534350709,296.1184999999999
-2022-01-01,3790.93,,296.0922499999999
+2022-09-01,3850.520476190475,65.31830534350709,296.808
+2022-01-01,3726.050952380952,,297.12649999999996
+2022-11-01,3770.55,,297.28574999999995

M templates/base.html.tera => templates/base.html.tera +3 -3

@@ 7,7 7,7 @@
     <meta name="theme-color" content="#000000" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="/style.css" />
-    <title>Dutch FIRE Calculator - how long would your portfolio last?</title>
+    <title>Dutch FIRE Calculator - how long would your retirement money last?</title>
   </head>
   <body>
     <nav>


@@ 21,14 21,14 @@
     <div class="c">
         <footer>
             <small>
-                <a href="https://github.com/dannyvankooten/dutchfirecalc.nl">Source code on GitHub</a> 
+                <svg height="16" viewBox="0 0 512 512" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm0 448c-110.5 0-200-89.5-200-200S145.5 56 256 56s200 89.5 200 200-89.5 200-200 200z"></path></svg> <a href="https://git.sr.ht/~dvko/www.dutchfirecalc.nl">Source code on sourcehut</a> 
                 &nbsp;&mdash;&nbsp;
                 Looking for the <a href="https://old.dutchfirecalc.nl/">old version of Dutch FIRE Calc</a>?
               </small>
               <br />
               <br />
               <small>
-                Made with &#10084; by <a href="https://dannyvankooten.com/" rel="author">Danny</a> and <a href="https://github.com/dannyvankooten/dutchfirecalc.nl/graphs/contributors">contributors</a>
+                Made with &#10084; by <a href="https://www.dannyvankooten.com/" rel="author">Danny van Kooten</a> 
               </small>
         </footer>
     </div>