Added new version

Updated init-letsencrypt

updated init-letsencrypt with docker-compose-init

updated init-letsencrypt with docker-compose-init

restored init-letsencrypt

updates to certbot

updates to certbot

updates to certbot

updates to certbot

updates to certbot

updates to certbot

updates to certbot

added certbot to scalelite-nginx

fixed settings for acme-challenge

added blacklist

updated init-letsencrypt for working with scaleite-nginx

Removed unnecessary files

percisted certbot logs and added env options to init-letsencrypt

8 files changed, 0 insertions, 172 deletions

diff --git a/scripts/README.md b/scripts/README.md
deleted file mode 100644
index c7d4cd9..0000000
--- a/scripts/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Helpers
-
-## Running automatic updates
-
-```
-sudo ln -s /home/ubuntu/scalelite-run/scripts/deploy.sh /usr/local/bin/scalelite-deploy
-sudo cp /home/ubuntu/scalelite-run/scripts/scalelite-auto-deployer.service /etc/systemd/system/scalelite-auto-deployer.service
-sudo cp /home/ubuntu/scalelite-run/scripts/scalelite-auto-deployer.timer /etc/systemd/system/scalelite-auto-deployer.timer
-sudo systemctl daemon-reload
-sudo systemctl enable scalelite-auto-deployer.service
-sudo systemctl enable scalelite-auto-deployer.timer
-sudo systemctl start scalelite-auto-deployer.timer
-```
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100755
index 66f9613..0000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-################################################################################
-# For this script to work properly it is required to define some environment variables
-# in the CI/CD Env variable declaration, while others should be passed as parameters.
-#
-#------------------------------------------------------------------------------
-# Defined as part of the CD/CI Env Variables:
-#
-# CD_DOCKER_USERNAME
-# A DockerHub username to be used for uploading the build.
-#
-# CD_DOCKER_PASSWORD
-# A DockerHub password to be used for uploading the build.
-#
-# CD_DOCKER_REPO
-# A DockerHub repository. By default the CD_REF_SLUG is also used as the docker repo.
-#
-# CD_BUILD_ALL
-# As the build is supposed to be done only for master (for a nightly deployments) and for releases
-# (like 'release-2.0.5' for production deployments), it is additionally required to include this
-# variable in order to build any other brnach, as it may be required for testing or reviewing work
-# as part of the development process.
-#
-
-display_usage() {
-  echo "This script should be used as part of a CI strategy."
-  echo -e "Usage:\n  build_image.sh [ARGUMENTS]"
-  echo -e "\nMandatory arguments \n"
-  echo -e "  repo_slug     The git repository  (e.g. blindsidenetworks/scalelite)"
-  echo -e "\nOptional arguments \n"
-  echo -e "  branch | tag  The branch (e.g. master | release-2.0.5)"
-}
-
-# if less than two arguments supplied, display usage
-if [ $# -le 0 ]; then
-	display_usage
-	exit 1
-fi
-
-# check whether user had supplied -h or --help . If yes display usage
-if [[ ($# == "--help") ||  $# == "-h" ]]; then
-	display_usage
-	exit 0
-fi
-
-export CD_REF_SLUG=$1
-export CD_REF_NAME=$2
-if [ -z $CD_REF_NAME ]; then
-  export CD_REF_NAME=$(git branch | grep \* | cut -d ' ' -f2)
-fi
-
-if [ "$CD_REF_NAME" != "master" ] && [[ "$CD_REF_NAME" != *"release"* ]] && ( [ -z "$CD_BUILD_ALL" ] || [ "$CD_BUILD_ALL" != "true" ] ); then
-  echo "#### Docker image for $CD_REF_SLUG:$CD_REF_NAME won't be built"
-  exit 0
-fi
-
-# Set the version tag when it is a release or the commit sha was included.
-if [[ "$CD_REF_NAME" == *"v"* ]]; then
-  export CD_BUILD_NUMBER=${CD_REF_NAME:1}
-else
-  export CD_BUILD_NUMBER="$CD_REF_NAME ($(eval git rev-parse --short=7 HEAD))"
-fi
-
-# Build the image
-if [ -z $CD_DOCKER_REPO ]; then
-  export CD_DOCKER_REPO=$CD_REF_SLUG
-fi
-echo "#### Docker image $CD_DOCKER_REPO:$CD_REF_NAME is being built"
-docker build --build-arg BUILD_NUMBER="${CD_BUILD_NUMBER}" -t $CD_DOCKER_REPO:$CD_REF_NAME .
-
-if [ -z "$CD_DOCKER_USERNAME" ] || [ -z "$CD_DOCKER_PASSWORD" ]; then
-  echo "#### Docker image for $CD_DOCKER_REPO can't be published because CD_DOCKER_USERNAME or CD_DOCKER_PASSWORD are missing (Ignore this warning if running outside a CD/CI environment)"
-  exit 0
-fi
-
-# Publish the image
-docker login -u="$CD_DOCKER_USERNAME" -p="$CD_DOCKER_PASSWORD"
-echo "#### Docker image $CD_DOCKER_REPO:$CD_REF_NAME is being published"
-docker push $CD_DOCKER_REPO
-
-# Publish image as latest and v2 if it is a release (excluding alpha and beta)
-if [[ "$CD_REF_NAME" == *"v"* ]] && [[ "$CD_REF_NAME" != *"alpha"* ]] && [[ "$CD_REF_NAME" != *"beta"* ]]; then
-  docker_image_id=$(docker images | grep -E "^$CD_DOCKER_REPO.*$CD_REF_NAME" | awk -e '{print $3}')
-  docker tag $docker_image_id $CD_DOCKER_REPO:latest
-  docker push $CD_DOCKER_REPO:latest
-  docker tag $docker_image_id $CD_DOCKER_REPO:v2
-  docker push $CD_DOCKER_REPO:v2
-fi
-exit 0
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
deleted file mode 100755
index bd78599..0000000
--- a/scripts/deploy.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-DIR="$(cd "$(dirname "$0")" && pwd)"
-STATUS="Status: Downloaded newer image for blindsidenetwks/scalelite:latest"
-
-new_status=$(sudo docker pull blindsidenetwks/scalelite:latest | grep Status:)
-
-echo $new_status
-
-if [ "$STATUS" == "$new_status" ]
-then
-  cd $DIR/..
-  docker-compose down
-  docker rmi $(docker images -f dangling=true -q)
-  docker-compose up -d
-fi
-
-exit 0
diff --git a/scripts/scalelite-auto-deployer.service b/scripts/scalelite-auto-deployer.service
deleted file mode 100644
index 55a70f4..0000000
--- a/scripts/scalelite-auto-deployer.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ScaleLite Auto Deployer
-
-[Service]
-ExecStart=/bin/bash /opt/scalelite-run/scripts/deploy.sh
-
-[Install]
-WantedBy=multi-user.target
-Alias=scalelite-auto-deployer
diff --git a/scripts/scalelite-auto-deployer.timer b/scripts/scalelite-auto-deployer.timer
deleted file mode 100644
index ec51cc1..0000000
--- a/scripts/scalelite-auto-deployer.timer
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Runs scalelite-deploy every minute
-
-[Timer]
-# Time to wait after booting before we run first time
-OnBootSec=1min
-# Time between running each consecutive time
-OnUnitActiveSec=1m
-Unit=scalelite-auto-deployer.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/scripts/scalelite-run.service b/scripts/scalelite-run.service
deleted file mode 100644
index 0d895e1..0000000
--- a/scripts/scalelite-run.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=ScaleLite Run
-After=network.target
-After=systemd-user-sessions.service
-After=network-online.target
-
-[Service]
-ExecStart=/bin/bash /opt/scalelite-run/scripts/start.sh
-ExecStop=/bin/bash /opt/scalelite-run/scripts/stop.sh
-TimeoutSec=30
-Restart=on-failure
-RestartSec=30
-StartLimitInterval=350
-StartLimitBurst=10
-
-[Install]
-WantedBy=multi-user.target
-Alias=scalelite-run
diff --git a/scripts/start.sh b/scripts/start.sh
deleted file mode 100755
index d320c52..0000000
--- a/scripts/start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-DIR="$(cd "$(dirname "$0")" && pwd)"
-
-cd $DIR/..
-docker-compose up -d
diff --git a/scripts/stop.sh b/scripts/stop.sh
deleted file mode 100755
index 34a3a51..0000000
--- a/scripts/stop.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-DIR="$(cd "$(dirname "$0")" && pwd)"
-
-cd $DIR/..
-docker-compose down