From e56c2fadb7e1eace6ae325f7e0e1184264009a6c Mon Sep 17 00:00:00 2001 From: bain Date: Mon, 4 Nov 2024 13:05:18 +0100 Subject: [PATCH] fix package setup --- config/clusters.json | 17 ----------------- config/env | 5 ----- config/ncc-hook.sh | 22 ---------------------- setup.py | 2 +- 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 config/clusters.json delete mode 100644 config/env delete mode 100755 config/ncc-hook.sh diff --git a/config/clusters.json b/config/clusters.json deleted file mode 100644 index 1096eee..0000000 --- a/config/clusters.json +++ /dev/null @@ -1,17 +0,0 @@ -[ - { - "name": "dummy1", - "upstreams": [ - "10.0.0.1", - "10.0.0.2", - "10.0.0.3" - ] - }, - { - "name": "dummy2", - "upstreams": [ - "127.0.0.1", - "127.0.0.2" - ] - } -] diff --git a/config/env b/config/env deleted file mode 100644 index 6a9fdf4..0000000 --- a/config/env +++ /dev/null @@ -1,5 +0,0 @@ -NGINX_DIR="/etc/nginx" -DOMAINS_TXT="/etc/autossl/domains.txt" -DEHYDRATED_BIN="/etc/autossl/dehydrated.sh" -REMOTE="10.0.0.1" -REMOTE_SSH_KEY="/etc/ncc/ssh.key" diff --git a/config/ncc-hook.sh b/config/ncc-hook.sh deleted file mode 100755 index 466096b..0000000 --- a/config/ncc-hook.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -# This hook is part of ncc. It creates a marker file on new cert deployments, -# so that ncc knows when to reload the cluster. - -deploy_cert() { - touch /etc/autossl/trigger; -} - -deploy_ocsp() { - touch /tmp/ncc-ssl-trigger; -} - -startup_hook() { - [ -f /tmp/ncc-ssl-trigger ] && rm /tmp/ncc-ssl-trigger || true; -} - -fn_exists() { declare -F "$1" > /dev/null; } - -HANDLER="$1"; shift -if fn_exists "$HANDLER"; then - "$HANDLER" "$@"; -fi diff --git a/setup.py b/setup.py index 09261f3..c677112 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup setup( name='ncc', version='1.0.0', - py_modules=['ncc'], + packages=['ncc'], install_requires=[ 'click', 'sysrsync',