manager: scripts moved to the repository root

diff --git a/manager/scripts/_env.sh b/scripts/_env.sh
similarity index 85%
rename from manager/scripts/_env.sh
rename to scripts/_env.sh
index cabc0025c2fd7f36a1e1ff9f86df4a171fcc98bb..5f38a27be1932e7174073be95463de26a2ca9566 100644 (file)
--- a/manager/scripts/_env.sh
+++ b/scripts/_env.sh
@@ -15,7 +15,7 @@ if test -z "$gitroot"; then
        echo -e "${red}This command can be run only in a git repository tree.${reset}"
        exit 1
 fi
-cd $gitroot/manager
+cd $gitroot
 
 # ensure consistent environment with virtualenv
 if test -z "$VIRTUAL_ENV" -a "$CI" != "true" -a -z "$KNOT_ENV"; then
@@ -34,19 +34,17 @@ PATH="$PATH:$gitroot/node_modules/.bin"
 # fail even on unbound variables
 set -o nounset
 
-
 function build_kresd {
-       pushd ..
-       if [ -d manager/.build_kresd ]; then
+       if [ -d .build_kresd ]; then
                echo
                echo Building Knot Resolver
                echo ----------------------
                echo -e "${blue}In case of an compilation error, run this command to try to fix it:${reset}"
                echo -e "\t${blue}rm -r $(realpath .install_kresd) $(realpath .build_kresd)${reset}"
                echo
-               ninja -C manager/.build_kresd
-               ninja install -C manager/.build_kresd
-               export PYTHONPATH="$(realpath manager/.build_kresd/python):${PYTHONPATH:-}"
+               ninja -C .build_kresd
+               ninja install -C .build_kresd
+               export PYTHONPATH="$(realpath .build_kresd/python):${PYTHONPATH:-}"
        else
                echo
                echo Knot Resolver daemon is not configured.
@@ -54,5 +52,4 @@ function build_kresd {
                echo
                exit 2
        fi
-       popd
 }

diff --git a/manager/scripts/codecheck b/scripts/codecheck
similarity index 87%
rename from manager/scripts/codecheck
rename to scripts/codecheck
index 3045d156272f22874c564df7e0a1a6c34f75af78..08ce18a89082933d19c15d34d25e1f3cfc82beaa 100755 (executable)
--- a/manager/scripts/codecheck
+++ b/scripts/codecheck
@@ -32,25 +32,25 @@ fi
 
 # check formatting using black
 echo -e "${yellow}Checking formatting using black...${reset}"
-black knot_resolver_manager tests scripts --check --diff
+black manager/knot_resolver_manager tests/manager scripts/create_setup.py --check --diff
 check_rv $?
 echo
 
 # check code with pylint
 echo -e "${yellow}Linting using pylint...${reset}"
-pylint knot_resolver_manager
+pylint manager/knot_resolver_manager
 check_rv $?
 echo
 
 # check code with flake8
 echo -e "${yellow}Linting using flake8...${reset}"
-flake8 --ignore=E266,W503 knot_resolver_manager
+flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 manager/knot_resolver_manager
 check_rv $?
 echo
 
 # check types with mypy
 echo -e "${yellow}Type checking using mypy...${reset}"
-mypy knot_resolver_manager
+mypy manager/knot_resolver_manager
 check_rv $?
 echo
 

diff --git a/manager/scripts/create_setup.py b/scripts/create_setup.py
similarity index 100%
rename from manager/scripts/create_setup.py
rename to scripts/create_setup.py

diff --git a/manager/scripts/docs b/scripts/docs
similarity index 65%
rename from manager/scripts/docs
rename to scripts/docs
index 10c83d8fc46dcf9fab5118e3d16ce31c96991bc5..d15c074eb21acd17e2664247de5c1aeb8a65f664 100755 (executable)
--- a/manager/scripts/docs
+++ b/scripts/docs
@@ -3,8 +3,8 @@
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh
-cd ..
 
-echo Building documentation for Knot Resolver
+echo Building Knot Resolver documentation
+echo ------------------------------------
 meson build_doc -Ddoc=enabled
 ninja -C build_doc doc

diff --git a/manager/scripts/examples b/scripts/examples
similarity index 76%
rename from manager/scripts/examples
rename to scripts/examples
index a5de766eb5c7f4f1fa3f99b9d069f0034639b5db..45f2243680e85971025b16fb6a2e6aa3a4e64241 100755 (executable)
--- a/manager/scripts/examples
+++ b/scripts/examples
@@ -5,7 +5,7 @@ src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh
 
 # validate all configuration examples
-for example in $PWD/etc/knot-resolver/config.example.*.yaml;
+for example in $PWD/etc/config/config.example.*.yaml;
 do
     poe kresctl validate --no-strict $example;
 done

diff --git a/manager/scripts/install.sh b/scripts/install.sh
similarity index 100%
rename from manager/scripts/install.sh
rename to scripts/install.sh

diff --git a/manager/scripts/make-package.sh b/scripts/make-package.sh
similarity index 100%
rename from manager/scripts/make-package.sh
rename to scripts/make-package.sh

diff --git a/manager/scripts/man b/scripts/man
similarity index 100%
rename from manager/scripts/man
rename to scripts/man

diff --git a/manager/scripts/meson-configure b/scripts/meson-configure
similarity index 51%
rename from manager/scripts/meson-configure
rename to scripts/meson-configure
index 3bebe4d8cdfc4f7a2ccff2c6211d27f529d5edde..452b1a3bc2b1a04bd8a231ec1a8497de37b7df16 100755 (executable)
--- a/manager/scripts/meson-configure
+++ b/scripts/meson-configure
@@ -4,12 +4,10 @@
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh
 
-pushd ..
 reconfigure=''
-if [ -f manager/.build_kresd/ninja.build ]; then
+if [ -f .build_kresd/ninja.build ]; then
        reconfigure='--reconfigure'
 fi
-meson setup manager/.build_kresd "$reconfigure" --prefix=$(realpath manager/.install_kresd) "$@"
-popd
+meson setup .build_kresd "$reconfigure" --prefix=$(realpath .install_kresd) "$@"
 
 build_kresd

diff --git a/manager/scripts/run b/scripts/run
similarity index 68%
rename from manager/scripts/run
rename to scripts/run
index 2080ce2a2776ea3e1df4b405f5fc0da1e3ea089f..c1bdf78b88ce24976e98cd4ce855e5b9fcb229d4 100755 (executable)
--- a/manager/scripts/run
+++ b/scripts/run
@@ -14,8 +14,8 @@ poetry build
 shopt -s globstar
 shopt -s nullglob
 for d in build/lib*; do
-    for f in "$d/"**/*.so; do
-        cp -v "$f" ${f#"$d/"}
+    for f in "manager/$d/"**/*.so; do
+        cp -v "$f" ${f#"manager/$d/"}
     done
 done
 shopt -u globstar
@@ -26,17 +26,17 @@ echo Knot Manager API is accessible on http://localhost:5000
 echo -------------------------------------------------------
 
 # create runtime directories
-if [ -z "${KRES_MANAGER_RUNTIME:-}" ]; then
-    KRES_MANAGER_RUNTIME="etc/knot-resolver"
+if [ -z "${KRES_CONFIG_DIR:-}" ]; then
+    KRES_CONFIG_DIR="etc/config"
 fi
-mkdir -p "$KRES_MANAGER_RUNTIME/runtime" "$KRES_MANAGER_RUNTIME/cache"
+mkdir -p "$KRES_CONFIG_DIR/runtime" "$KRES_CONFIG_DIR/cache"
 
 if [ -z "${KRES_MANAGER_CONFIG:-}" ]; then
-    KRES_MANAGER_CONFIG="$KRES_MANAGER_RUNTIME/config.dev.yaml"
+    KRES_MANAGER_CONFIG="$KRES_CONFIG_DIR/config.dev.yaml"
 fi
 
 if [ -z "${KRES_MANAGER_API_SOCK:-}" ]; then
-    KRES_MANAGER_API_SOCK="$KRES_MANAGER_RUNTIME/manager.sock"
+    KRES_MANAGER_API_SOCK="$KRES_CONFIG_DIR/manager.sock"
 fi
 
 export KRES_MANAGER_CONFIG

diff --git a/manager/scripts/run-debug b/scripts/run-debug
similarity index 100%
rename from manager/scripts/run-debug
rename to scripts/run-debug