diff --git a/Dockerfile b/Dockerfile index 84ccc4d..7e340fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ LABEL maintainer="Sebastian Ramirez " WORKDIR /usr/local/share/uvicorn-gunicorn # install uvicorn-gunicorn -COPY "./install/mini-tiangolo/" "." +COPY "./deploy/mini-tiangolo/" "." RUN set -ex; \ chmod +x start.sh; \ diff --git a/README.md b/README.md index 96ba2f1..4470818 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ All that matters, at one glance!
*Date and Time – Upcoming Events – Public Announcements – News – Pictures* - **Easy Install**
-Set up a RaspberryPi, run the [installer script](./install/install.sh), done! +Set up a RaspberryPi, run the [installer script](./deploy/install.sh), done! - **DAV Server Interface**
Update your content anytime, from anywhere! @@ -54,7 +54,7 @@ It is also heavily advisable that you log into your device using SSH, so you sho ### Install Base System -`OVDashboard` is designed to run on a `DietPi` installation. Full installation documentation is available [at dietpi.com](https://dietpi.com/docs/install/). To quickly get up and running: +`OVDashboard` is designed to run on a `DietPi` installation. Full installation documentation is available [at dietpi.com](https://dietpi.com/docs/deploy/). To quickly get up and running: 1. Download Image from [dietpi.com/#download](https://dietpi.com/#download) 1. Uncompress Image and flash onto SD card – you might need "7zip", "balenaEtcher" and/or other tools @@ -66,15 +66,15 @@ It is also heavily advisable that you log into your device using SSH, so you sho ### Install OVDashboard -Download (and review) the [OVDashboard install script](//code.yavook.de/OEKZident.de/ovdashboard/raw/branch/master/install/install.sh), then run it from a terminal. +Download (and review) the [OVDashboard install script](//code.yavook.de/OEKZident.de/ovdashboard/raw/branch/master/deploy/install.sh), then run it from a terminal. This can all be done after logging into your prepared device: - The safe way: 1. `mkdir /tmp/ovdashboard && cd /tmp/ovdashboard` - 1. `wget 'https://code.yavook.de/OEKZident.de/ovdashboard/raw/branch/master/install/install.sh'` + 1. `wget 'https://code.yavook.de/OEKZident.de/ovdashboard/raw/branch/master/deploy/install.sh'` 1. `less install.sh` and/or edit with `nano install.sh` 1. `sh install.sh` -- If you feel adventurous and do not want to review the script, just run `sh <( curl --proto '=https' --tlsv1.2 -sSf 'https://code.yavook.de/OEKZident.de/ovdashboard/raw/branch/master/install/install.sh' )` +- If you feel adventurous and do not want to review the script, just run `sh <( curl --proto '=https' --tlsv1.2 -sSf 'https://code.yavook.de/OEKZident.de/ovdashboard/raw/branch/master/deploy/install.sh' )` > There will be some prompts during installation. > diff --git a/install/chores/check_version b/deploy/chores/check_version similarity index 91% rename from install/chores/check_version rename to deploy/chores/check_version index 8cc8d8a..2bca03b 100755 --- a/install/chores/check_version +++ b/deploy/chores/check_version @@ -31,4 +31,6 @@ else mark="❌️" fi -echo "git: ${git_version}, api: ${api_version}, ui: ${ui_version}, installer: ${install_version} ${mark}" \ No newline at end of file +echo "git: ${git_version}, api: ${api_version}, ui: ${ui_version}, installer: ${install_version} ${mark}" + +[ "${mark}" = "✅️" ] || exit 1 diff --git a/install/docker-compose.yml b/deploy/docker-compose.yml similarity index 100% rename from install/docker-compose.yml rename to deploy/docker-compose.yml diff --git a/install/install.sh b/deploy/install.sh similarity index 98% rename from install/install.sh rename to deploy/install.sh index a590ea0..25c8925 100644 --- a/install/install.sh +++ b/deploy/install.sh @@ -71,7 +71,7 @@ mkdir -p /opt/ovdashboard curl \ --proto "=https" --tlsv1.2 -sSf \ --output "/opt/ovdashboard/docker-compose.yml" \ - "https://code.yavook.de/OEKZident.de/ovdashboard/raw/tag/v${ovd_version}/install/docker-compose.yml" + "https://code.yavook.de/OEKZident.de/ovdashboard/raw/tag/v${ovd_version}/deploy/docker-compose.yml" echo "Please review the Docker Compose file before continuing! [press Enter]" read -r _ENTER nano "/opt/ovdashboard/docker-compose.yml" diff --git a/install/mini-tiangolo/gunicorn_conf.py b/deploy/mini-tiangolo/gunicorn_conf.py similarity index 100% rename from install/mini-tiangolo/gunicorn_conf.py rename to deploy/mini-tiangolo/gunicorn_conf.py diff --git a/install/mini-tiangolo/start.sh b/deploy/mini-tiangolo/start.sh similarity index 100% rename from install/mini-tiangolo/start.sh rename to deploy/mini-tiangolo/start.sh