From a6e93f19e3147e2e21d4a838e6e232c9a99f8684 Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Sat, 25 Apr 2020 09:58:29 -0400
Subject: 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
---
 scalelite/bin/start           | 34 ----------------------------------
 scalelite/bin/start-poller    |  5 -----
 scalelite/config/database.yml | 23 -----------------------
 scalelite/dotenv              |  2 --
 4 files changed, 64 deletions(-)
 delete mode 100755 scalelite/bin/start
 delete mode 100755 scalelite/bin/start-poller
 delete mode 100644 scalelite/config/database.yml
 delete mode 100644 scalelite/dotenv

(limited to 'scalelite')

diff --git a/scalelite/bin/start b/scalelite/bin/start
deleted file mode 100755
index 2887034..0000000
--- a/scalelite/bin/start
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-if [ "$LOADBALNCER_SECRET" == "loadbalancer_secret" ] || [ "$SECRET_KEY_BASE" == "secret_key_base" ]; then
-  echo "ERROR: Detected default SECRET_KEY_BASE or LOADBALANCER_SECRET. Please generate a random value."
-  echo "Exiting..."
-  exit 1
-fi
-
-servers="$(RAILS_ENV=$RAILS_ENV bundle exec rake servers 2>&1)"
-echo $servers
-
-if [ "$RAILS_ENV" = "production" ] && [ "$DB_ADAPTER" = "postgresql" ]; then
-  while ! curl http://$DB_HOST:${DB_PORT:-5432}/ 2>&1 | grep '52'
-  do
-    echo "Waiting for postgres to start up ..."
-    sleep 1
-  done
-fi
-
-db_create="$(RAILS_ENV=$RAILS_ENV bundle exec rake db:create 2>&1)"
-echo $db_create
-
-if [[ $db_create == *"already exists"* ]]; then
-  echo ">>> Database migration"
-  bundle exec rake db:migrate
-else
-  echo ">>> Database initialization"
-  bundle exec rake db:schema:load
-fi
-
-exec tini -- bundle exec puma -C config/puma.rb "$@"
-#tail -f /dev/null
-#bundle exec puma -C config/puma.rb
-#bundle exec rails s -b 0.0.0.0 -p 3000
diff --git a/scalelite/bin/start-poller b/scalelite/bin/start-poller
deleted file mode 100755
index 608e81c..0000000
--- a/scalelite/bin/start-poller
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo "Poller is starting..."
-exec tini -- bundle exec rake poll["$INTERVAL"]
-#tail -f /dev/null
diff --git a/scalelite/config/database.yml b/scalelite/config/database.yml
deleted file mode 100644
index 80a0afd..0000000
--- a/scalelite/config/database.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-default: &default
-  pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
-  timeout: 5000
-  adapter: postgresql
-  host: <%= ENV['DB_HOST'] %>
-  username: <%= ENV['DB_USERNAME'] %>
-  password: <%= ENV['DB_PASSWORD'] %>
-  encoding: unicode
-
-development:
-  <<: *default
-  database: scalelite_development
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: scalelite_test
-
-production:
-  <<: *default
-  database: <%= ENV['DB_NAME'] || 'scalelite' %>
diff --git a/scalelite/dotenv b/scalelite/dotenv
deleted file mode 100644
index 5d25411..0000000
--- a/scalelite/dotenv
+++ /dev/null
@@ -1,2 +0,0 @@
-SECRET_KEY_BASE=secret_key_base
-LOADBALANCER_SECRET=loadbalancer_secret
-- 
cgit v1.2.3