From 92ce2543409dc51bad70dc3b080b7476d45f09ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zden=C4=9Bk=20Borovec?= Date: Thu, 21 Dec 2023 17:20:36 +0100 Subject: [PATCH] hopefully final deployment fixes --- assets/common/planks_dark_tile.png | Bin assets/common/planks_light_tile.png | Bin assets/common/stones_tile.png | Bin assets/common/styles.css | 6 +++--- deploy-local | 19 ++++++------------- deploy-server | 4 ++-- docs/common/header.php | 8 ++++---- docs/www/index.php | 2 +- 8 files changed, 16 insertions(+), 23 deletions(-) mode change 100644 => 100755 assets/common/planks_dark_tile.png mode change 100644 => 100755 assets/common/planks_light_tile.png mode change 100644 => 100755 assets/common/stones_tile.png mode change 100644 => 100755 assets/common/styles.css diff --git a/assets/common/planks_dark_tile.png b/assets/common/planks_dark_tile.png old mode 100644 new mode 100755 diff --git a/assets/common/planks_light_tile.png b/assets/common/planks_light_tile.png old mode 100644 new mode 100755 diff --git a/assets/common/stones_tile.png b/assets/common/stones_tile.png old mode 100644 new mode 100755 diff --git a/assets/common/styles.css b/assets/common/styles.css old mode 100644 new mode 100755 index ad0948b..e164704 --- a/assets/common/styles.css +++ b/assets/common/styles.css @@ -1,5 +1,5 @@ body { - background-image: url("https://assets.zdenekborovec.cz/common/stones_tile.png"); + background-image: url("http://assets.zdenekborovec-dev.cz/common/stones_tile.png"); background-repeat: repeat; display: flex; } @@ -14,7 +14,7 @@ main { align-self: center; margin: auto; - background-image: url("https://assets.zdenekborovec.cz/common/planks_light_tile.png"); + background-image: url("http://assets.zdenekborovec-dev.cz/common/planks_light_tile.png"); background-repeat: repeat; color: black; border-radius: 2em; @@ -49,7 +49,7 @@ hr { border-color: black; border-radius: 0.5em; float: right; - background-image: url("https://assets.zdenekborovec.cz/common/planks_dark_tile.png"); + background-image: url("http://assets.zdenekborovec-dev.cz/common/planks_dark_tile.png"); background-repeat: repeat; color: white; padding: 1em; diff --git a/deploy-local b/deploy-local index 1a2952d..7361340 100755 --- a/deploy-local +++ b/deploy-local @@ -1,16 +1,9 @@ #!/bin/sh -# Copy the docs and assets directories onto the server -cp -r docs /srv/http -cp -r assets /srv/http - -# Update the header css GET parameter -sed -i "s/TIMESTAMP/"$(date +%s)"/g" /srv/http/docs/common/header.php - # Replace localhost addresses with proper -find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/https:\/\/www.zdenekborovec.cz/http:\/\/www.zdenekborovec-dev.cz/g' -find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/https:\/\/assets.zdenekborovec.cz/http:\/\/assets.zdenekborovec-dev.cz/g' -find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/https:\/\/zdenekborovec.cz/http:\/\/zdenekborovec-dev.cz/g' -find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/https:\/\/www.zdenekborovec.cz/http:\/\/www.zdenekborovec-dev.cz/g' -find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/https:\/\/assets.zdenekborovec.cz/http:\/\/assets.zdenekborovec-dev.cz/g' -find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/https:\/\/zdenekborovec.cz/http:\/\/zdenekborovec-dev.cz/g' +find docs -type f -print0 | xargs -0 sed -i 's/https:\/\/www.zdenekborovec.cz/http:\/\/www.zdenekborovec-dev.cz/g' +find docs -type f -print0 | xargs -0 sed -i 's/https:\/\/assets.zdenekborovec.cz\/common/http:\/\/assets.zdenekborovec-dev.cz\/common/g' +find docs -type f -print0 | xargs -0 sed -i 's/https:\/\/zdenekborovec.cz/http:\/\/zdenekborovec-dev.cz/g' +find assets -type f -print0 | xargs -0 sed -i 's/https:\/\/www.zdenekborovec.cz/http:\/\/www.zdenekborovec-dev.cz/g' +find assets -type f -print0 | xargs -0 sed -i 's/https:\/\/assets.zdenekborovec.cz\/common/http:\/\/assets.zdenekborovec-dev.cz\/common/g' +find assets -type f -print0 | xargs -0 sed -i 's/https:\/\/zdenekborovec.cz/http:\/\/zdenekborovec-dev.cz/g' diff --git a/deploy-server b/deploy-server index 5b498eb..ec6ba6a 100755 --- a/deploy-server +++ b/deploy-server @@ -9,8 +9,8 @@ sed -i "s/TIMESTAMP/"$(date +%s)"/g" /srv/http/docs/common/header.php # Replace localhost addresses with proper find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/http:\/\/www.zdenekborovec-dev.cz/https:\/\/www.zdenekborovec.cz/g' -find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/http:\/\/assets.zdenekborovec-dev.cz/https:\/\/assets.zdenekborovec.cz/g' +find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/http:\/\/assets.zdenekborovec-dev.cz\/common/https:\/\/assets.zdenekborovec.cz\/common/g' find /srv/http/docs -type f -print0 | xargs -0 sed -i 's/http:\/\/zdenekborovec-dev.cz/https:\/\/zdenekborovec.cz/g' find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/http:\/\/www.zdenekborovec-dev.cz/https:\/\/www.zdenekborovec.cz/g' -find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/http:\/\/assets.zdenekborovec-dev.cz/https:\/\/assets.zdenekborovec.cz/g' +find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/http:\/\/assets.zdenekborovec-dev.cz\/common/https:\/\/assets.zdenekborovec.cz\/common/g' find /srv/http/assets -type f -print0 | xargs -0 sed -i 's/http:\/\/zdenekborovec-dev.cz/https:\/\/zdenekborovec.cz/g' diff --git a/docs/common/header.php b/docs/common/header.php index 2cad7a8..1488408 100755 --- a/docs/common/header.php +++ b/docs/common/header.php @@ -1,5 +1,5 @@ - +