move cg and monitor to tools folder

change path in files to new location

Signed-off-by: aog <theaog@users.noreply.github.com>

Makefile

@@ -1,7 +1,7 @@
 VER := 0.4.3rc1
 
 all:
-	make -C cleaner/cg
+	make -C tools/cg
 	make -C master
 	make -C host
 	make -C tor
@@ -122,12 +122,12 @@ FILES_ROOT += "segfault-$(VER)/sfbin/sf"
 FILES_ROOT += "segfault-$(VER)/sfbin/loginmsg-new.sh-example"
 FILES_ROOT += "segfault-$(VER)/sfbin/loginmsg-all.sh-example"
 
-FILES_CLEANER += "segfault-$(VER)/cleaner/cg/Dockerfile"
-FILES_CLEANER += "segfault-$(VER)/cleaner/cg/go.mod"
-FILES_CLEANER += "segfault-$(VER)/cleaner/cg/go.sum"
-FILES_CLEANER += "segfault-$(VER)/cleaner/cg/main.go"
-FILES_CLEANER += "segfault-$(VER)/cleaner/cg/Makefile"
-FILES_CLEANER += "segfault-$(VER)/cleaner/cg/sysinfo_linux.go"
+FILES_CLEANER += "segfault-$(VER)/tools/cg/Dockerfile"
+FILES_CLEANER += "segfault-$(VER)/tools/cg/go.mod"
+FILES_CLEANER += "segfault-$(VER)/tools/cg/go.sum"
+FILES_CLEANER += "segfault-$(VER)/tools/cg/main.go"
+FILES_CLEANER += "segfault-$(VER)/tools/cg/Makefile"
+FILES_CLEANER += "segfault-$(VER)/tools/cg/sysinfo_linux.go"
 
 FILES += $(FILES_CLEANER) $(FILES_MASTER) $(FILES_ROOT) $(FILES_GSNC) $(FILES_CONFIG) $(FILES_ROUTER) $(FILES_TOR) $(FILES_ENCFSD) $(FILES_GUEST) $(FILES_HOST) $(FILES_PROVISION)
 TARX = $(shell command -v gtar 2>/dev/null)

admin/monitor_ssh/go.mod

@@ -1,11 +0,0 @@
-module mfs
-
-go 1.19
-
-require (
-	github.com/sirupsen/logrus v1.9.0
-	github.com/yanzay/tbot/v2 v2.2.0
-	golang.org/x/crypto v0.1.0
-)
-
-require golang.org/x/sys v0.2.0 // indirect

docker-compose.yml

@@ -87,7 +87,7 @@ services:
       - "${SF_BASEDIR:-.}/sfbin:/sf/bin:ro"
 
   sf-containerguard:
-    build: cleaner/cg
+    build: tools/cg
     image: sf-containerguard
     container_name: sf-containerguard
     restart: ${SF_RESTART:-on-failure}

tools/monitor_ssh/go.mod

@@ -0,0 +1,14 @@
+module mfs
+
+go 1.19
+
+require (
+	github.com/sirupsen/logrus v1.9.0
+	github.com/yanzay/tbot/v2 v2.2.0
+	golang.org/x/crypto v0.6.0
+)
+
+require (
+	github.com/stretchr/testify v1.8.1 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+)

tools/monitor_ssh/go.sum

@@ -6,16 +6,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/yanzay/tbot/v2 v2.2.0 h1:bK1+XTwY59IskXpwtHc/ItfU2uELTTqYP3pajfBaPeM=
 github.com/yanzay/tbot/v2 v2.2.0/go.mod h1:q0+8JblBq9tLAnKHdBIZsHwDvMS9TfO6mNfaAk1VrHg=
-golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=