diff --git a/decnet/engine/deployer.py b/decnet/engine/deployer.py index 55de388..08334b0 100644 --- a/decnet/engine/deployer.py +++ b/decnet/engine/deployer.py @@ -31,7 +31,7 @@ from decnet.network import ( log = get_logger("engine") console = Console() COMPOSE_FILE = Path("decnet-compose.yml") -_CANONICAL_LOGGING = Path(__file__).parent.parent.parent / "templates" / "syslog_bridge.py" +_CANONICAL_LOGGING = Path(__file__).parent.parent / "templates" / "syslog_bridge.py" def _sync_logging_helper(config: DecnetConfig) -> None: diff --git a/decnet/services/conpot.py b/decnet/services/conpot.py index 643eac6..5eacff6 100644 --- a/decnet/services/conpot.py +++ b/decnet/services/conpot.py @@ -32,4 +32,4 @@ class ConpotService(BaseService): } def dockerfile_context(self): - return Path(__file__).parent.parent.parent / "templates" / "conpot" + return Path(__file__).parent.parent / "templates" / "conpot" diff --git a/decnet/services/docker_api.py b/decnet/services/docker_api.py index 4cc8e89..d4db39c 100644 --- a/decnet/services/docker_api.py +++ b/decnet/services/docker_api.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "docker_api" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "docker_api" class DockerAPIService(BaseService): diff --git a/decnet/services/elasticsearch.py b/decnet/services/elasticsearch.py index 146cfca..d4bb65c 100644 --- a/decnet/services/elasticsearch.py +++ b/decnet/services/elasticsearch.py @@ -2,7 +2,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "elasticsearch" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "elasticsearch" class ElasticsearchService(BaseService): diff --git a/decnet/services/ftp.py b/decnet/services/ftp.py index d034c81..0a1cafe 100644 --- a/decnet/services/ftp.py +++ b/decnet/services/ftp.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "ftp" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "ftp" class FTPService(BaseService): diff --git a/decnet/services/http.py b/decnet/services/http.py index 28e2d47..56928de 100644 --- a/decnet/services/http.py +++ b/decnet/services/http.py @@ -2,7 +2,7 @@ import json from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "http" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "http" class HTTPService(BaseService): diff --git a/decnet/services/https.py b/decnet/services/https.py index 3734651..3c6735a 100644 --- a/decnet/services/https.py +++ b/decnet/services/https.py @@ -2,7 +2,7 @@ import json from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "https" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "https" class HTTPSService(BaseService): diff --git a/decnet/services/imap.py b/decnet/services/imap.py index cf8d09f..902f57c 100644 --- a/decnet/services/imap.py +++ b/decnet/services/imap.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "imap" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "imap" class IMAPService(BaseService): diff --git a/decnet/services/k8s.py b/decnet/services/k8s.py index b5b3f24..32cc56d 100644 --- a/decnet/services/k8s.py +++ b/decnet/services/k8s.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "k8s" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "k8s" class KubernetesAPIService(BaseService): diff --git a/decnet/services/ldap.py b/decnet/services/ldap.py index 48db9f5..76eaa2d 100644 --- a/decnet/services/ldap.py +++ b/decnet/services/ldap.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "ldap" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "ldap" class LDAPService(BaseService): diff --git a/decnet/services/llmnr.py b/decnet/services/llmnr.py index 9dd4bc7..4319737 100644 --- a/decnet/services/llmnr.py +++ b/decnet/services/llmnr.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "llmnr" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "llmnr" class LLMNRService(BaseService): diff --git a/decnet/services/mongodb.py b/decnet/services/mongodb.py index 4dcad69..397faaf 100644 --- a/decnet/services/mongodb.py +++ b/decnet/services/mongodb.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "mongodb" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "mongodb" class MongoDBService(BaseService): diff --git a/decnet/services/mqtt.py b/decnet/services/mqtt.py index e85e14c..60d134f 100644 --- a/decnet/services/mqtt.py +++ b/decnet/services/mqtt.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "mqtt" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "mqtt" class MQTTService(BaseService): diff --git a/decnet/services/mssql.py b/decnet/services/mssql.py index 9658325..46b262d 100644 --- a/decnet/services/mssql.py +++ b/decnet/services/mssql.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "mssql" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "mssql" class MSSQLService(BaseService): diff --git a/decnet/services/mysql.py b/decnet/services/mysql.py index f8d15da..deb5b50 100644 --- a/decnet/services/mysql.py +++ b/decnet/services/mysql.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "mysql" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "mysql" class MySQLService(BaseService): diff --git a/decnet/services/pop3.py b/decnet/services/pop3.py index 5caba08..58e33ad 100644 --- a/decnet/services/pop3.py +++ b/decnet/services/pop3.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "pop3" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "pop3" class POP3Service(BaseService): diff --git a/decnet/services/postgres.py b/decnet/services/postgres.py index 1dbcfa3..8a75ded 100644 --- a/decnet/services/postgres.py +++ b/decnet/services/postgres.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "postgres" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "postgres" class PostgresService(BaseService): diff --git a/decnet/services/rdp.py b/decnet/services/rdp.py index 7c9ac48..26057ff 100644 --- a/decnet/services/rdp.py +++ b/decnet/services/rdp.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "rdp" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "rdp" class RDPService(BaseService): diff --git a/decnet/services/redis.py b/decnet/services/redis.py index 263823c..b6c9b5c 100644 --- a/decnet/services/redis.py +++ b/decnet/services/redis.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "redis" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "redis" class RedisService(BaseService): diff --git a/decnet/services/sip.py b/decnet/services/sip.py index 0d50f65..0566539 100644 --- a/decnet/services/sip.py +++ b/decnet/services/sip.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "sip" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "sip" class SIPService(BaseService): diff --git a/decnet/services/smb.py b/decnet/services/smb.py index da96971..f6a43ca 100644 --- a/decnet/services/smb.py +++ b/decnet/services/smb.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "smb" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "smb" class SMBService(BaseService): diff --git a/decnet/services/smtp.py b/decnet/services/smtp.py index 3e616b5..364b38b 100644 --- a/decnet/services/smtp.py +++ b/decnet/services/smtp.py @@ -2,7 +2,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "smtp" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "smtp" class SMTPService(BaseService): diff --git a/decnet/services/smtp_relay.py b/decnet/services/smtp_relay.py index 7656e19..7144db5 100644 --- a/decnet/services/smtp_relay.py +++ b/decnet/services/smtp_relay.py @@ -4,7 +4,7 @@ from decnet.services.base import BaseService # Reuses the same template as the smtp service — only difference is # SMTP_OPEN_RELAY=1 in the environment, which enables the open relay persona. -_TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "smtp" +_TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "smtp" class SMTPRelayService(BaseService): diff --git a/decnet/services/sniffer.py b/decnet/services/sniffer.py index 2f0dd2e..5a12ea6 100644 --- a/decnet/services/sniffer.py +++ b/decnet/services/sniffer.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "sniffer" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "sniffer" class SnifferService(BaseService): diff --git a/decnet/services/snmp.py b/decnet/services/snmp.py index 613b426..0e67ce8 100644 --- a/decnet/services/snmp.py +++ b/decnet/services/snmp.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "snmp" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "snmp" class SNMPService(BaseService): diff --git a/decnet/services/ssh.py b/decnet/services/ssh.py index f3bc18e..f721f82 100644 --- a/decnet/services/ssh.py +++ b/decnet/services/ssh.py @@ -2,7 +2,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "ssh" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "ssh" class SSHService(BaseService): diff --git a/decnet/services/telnet.py b/decnet/services/telnet.py index f022fac..81ee798 100644 --- a/decnet/services/telnet.py +++ b/decnet/services/telnet.py @@ -2,7 +2,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "telnet" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "telnet" class TelnetService(BaseService): diff --git a/decnet/services/tftp.py b/decnet/services/tftp.py index 17ddd4c..a51ba7f 100644 --- a/decnet/services/tftp.py +++ b/decnet/services/tftp.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "tftp" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "tftp" class TFTPService(BaseService): diff --git a/decnet/services/vnc.py b/decnet/services/vnc.py index 63cfdee..0c5834e 100644 --- a/decnet/services/vnc.py +++ b/decnet/services/vnc.py @@ -1,7 +1,7 @@ from pathlib import Path from decnet.services.base import BaseService -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "templates" / "vnc" +TEMPLATES_DIR = Path(__file__).parent.parent / "templates" / "vnc" class VNCService(BaseService): diff --git a/templates/conpot/Dockerfile b/decnet/templates/conpot/Dockerfile similarity index 100% rename from templates/conpot/Dockerfile rename to decnet/templates/conpot/Dockerfile diff --git a/templates/conpot/entrypoint.py b/decnet/templates/conpot/entrypoint.py similarity index 100% rename from templates/conpot/entrypoint.py rename to decnet/templates/conpot/entrypoint.py diff --git a/templates/conpot/syslog_bridge.py b/decnet/templates/conpot/syslog_bridge.py similarity index 100% rename from templates/conpot/syslog_bridge.py rename to decnet/templates/conpot/syslog_bridge.py diff --git a/templates/cowrie/Dockerfile b/decnet/templates/cowrie/Dockerfile similarity index 100% rename from templates/cowrie/Dockerfile rename to decnet/templates/cowrie/Dockerfile diff --git a/templates/cowrie/cowrie.cfg.j2 b/decnet/templates/cowrie/cowrie.cfg.j2 similarity index 100% rename from templates/cowrie/cowrie.cfg.j2 rename to decnet/templates/cowrie/cowrie.cfg.j2 diff --git a/templates/cowrie/entrypoint.sh b/decnet/templates/cowrie/entrypoint.sh similarity index 100% rename from templates/cowrie/entrypoint.sh rename to decnet/templates/cowrie/entrypoint.sh diff --git a/templates/cowrie/honeyfs/etc/group b/decnet/templates/cowrie/honeyfs/etc/group similarity index 100% rename from templates/cowrie/honeyfs/etc/group rename to decnet/templates/cowrie/honeyfs/etc/group diff --git a/templates/cowrie/honeyfs/etc/hostname b/decnet/templates/cowrie/honeyfs/etc/hostname similarity index 100% rename from templates/cowrie/honeyfs/etc/hostname rename to decnet/templates/cowrie/honeyfs/etc/hostname diff --git a/templates/cowrie/honeyfs/etc/hosts b/decnet/templates/cowrie/honeyfs/etc/hosts similarity index 100% rename from templates/cowrie/honeyfs/etc/hosts rename to decnet/templates/cowrie/honeyfs/etc/hosts diff --git a/templates/cowrie/honeyfs/etc/issue b/decnet/templates/cowrie/honeyfs/etc/issue similarity index 100% rename from templates/cowrie/honeyfs/etc/issue rename to decnet/templates/cowrie/honeyfs/etc/issue diff --git a/templates/cowrie/honeyfs/etc/issue.net b/decnet/templates/cowrie/honeyfs/etc/issue.net similarity index 100% rename from templates/cowrie/honeyfs/etc/issue.net rename to decnet/templates/cowrie/honeyfs/etc/issue.net diff --git a/templates/cowrie/honeyfs/etc/motd b/decnet/templates/cowrie/honeyfs/etc/motd similarity index 100% rename from templates/cowrie/honeyfs/etc/motd rename to decnet/templates/cowrie/honeyfs/etc/motd diff --git a/templates/cowrie/honeyfs/etc/os-release b/decnet/templates/cowrie/honeyfs/etc/os-release similarity index 100% rename from templates/cowrie/honeyfs/etc/os-release rename to decnet/templates/cowrie/honeyfs/etc/os-release diff --git a/templates/cowrie/honeyfs/etc/passwd b/decnet/templates/cowrie/honeyfs/etc/passwd similarity index 100% rename from templates/cowrie/honeyfs/etc/passwd rename to decnet/templates/cowrie/honeyfs/etc/passwd diff --git a/templates/cowrie/honeyfs/etc/resolv.conf b/decnet/templates/cowrie/honeyfs/etc/resolv.conf similarity index 100% rename from templates/cowrie/honeyfs/etc/resolv.conf rename to decnet/templates/cowrie/honeyfs/etc/resolv.conf diff --git a/templates/cowrie/honeyfs/etc/shadow b/decnet/templates/cowrie/honeyfs/etc/shadow similarity index 100% rename from templates/cowrie/honeyfs/etc/shadow rename to decnet/templates/cowrie/honeyfs/etc/shadow diff --git a/templates/cowrie/honeyfs/home/admin/.aws/credentials b/decnet/templates/cowrie/honeyfs/home/admin/.aws/credentials similarity index 100% rename from templates/cowrie/honeyfs/home/admin/.aws/credentials rename to decnet/templates/cowrie/honeyfs/home/admin/.aws/credentials diff --git a/templates/cowrie/honeyfs/home/admin/.bash_history b/decnet/templates/cowrie/honeyfs/home/admin/.bash_history similarity index 100% rename from templates/cowrie/honeyfs/home/admin/.bash_history rename to decnet/templates/cowrie/honeyfs/home/admin/.bash_history diff --git a/templates/cowrie/honeyfs/home/admin/.ssh/authorized_keys b/decnet/templates/cowrie/honeyfs/home/admin/.ssh/authorized_keys similarity index 100% rename from templates/cowrie/honeyfs/home/admin/.ssh/authorized_keys rename to decnet/templates/cowrie/honeyfs/home/admin/.ssh/authorized_keys diff --git a/templates/cowrie/honeyfs/root/.bash_history b/decnet/templates/cowrie/honeyfs/root/.bash_history similarity index 100% rename from templates/cowrie/honeyfs/root/.bash_history rename to decnet/templates/cowrie/honeyfs/root/.bash_history diff --git a/templates/cowrie/honeyfs/var/log/auth.log b/decnet/templates/cowrie/honeyfs/var/log/auth.log similarity index 100% rename from templates/cowrie/honeyfs/var/log/auth.log rename to decnet/templates/cowrie/honeyfs/var/log/auth.log diff --git a/templates/docker_api/Dockerfile b/decnet/templates/docker_api/Dockerfile similarity index 100% rename from templates/docker_api/Dockerfile rename to decnet/templates/docker_api/Dockerfile diff --git a/templates/docker_api/entrypoint.sh b/decnet/templates/docker_api/entrypoint.sh similarity index 100% rename from templates/docker_api/entrypoint.sh rename to decnet/templates/docker_api/entrypoint.sh diff --git a/templates/docker_api/server.py b/decnet/templates/docker_api/server.py similarity index 100% rename from templates/docker_api/server.py rename to decnet/templates/docker_api/server.py diff --git a/templates/docker_api/syslog_bridge.py b/decnet/templates/docker_api/syslog_bridge.py similarity index 100% rename from templates/docker_api/syslog_bridge.py rename to decnet/templates/docker_api/syslog_bridge.py diff --git a/templates/elasticsearch/Dockerfile b/decnet/templates/elasticsearch/Dockerfile similarity index 100% rename from templates/elasticsearch/Dockerfile rename to decnet/templates/elasticsearch/Dockerfile diff --git a/templates/elasticsearch/entrypoint.sh b/decnet/templates/elasticsearch/entrypoint.sh similarity index 100% rename from templates/elasticsearch/entrypoint.sh rename to decnet/templates/elasticsearch/entrypoint.sh diff --git a/templates/elasticsearch/server.py b/decnet/templates/elasticsearch/server.py similarity index 100% rename from templates/elasticsearch/server.py rename to decnet/templates/elasticsearch/server.py diff --git a/templates/elasticsearch/syslog_bridge.py b/decnet/templates/elasticsearch/syslog_bridge.py similarity index 100% rename from templates/elasticsearch/syslog_bridge.py rename to decnet/templates/elasticsearch/syslog_bridge.py diff --git a/templates/ftp/Dockerfile b/decnet/templates/ftp/Dockerfile similarity index 100% rename from templates/ftp/Dockerfile rename to decnet/templates/ftp/Dockerfile diff --git a/templates/ftp/entrypoint.sh b/decnet/templates/ftp/entrypoint.sh similarity index 100% rename from templates/ftp/entrypoint.sh rename to decnet/templates/ftp/entrypoint.sh diff --git a/templates/ftp/server.py b/decnet/templates/ftp/server.py similarity index 100% rename from templates/ftp/server.py rename to decnet/templates/ftp/server.py diff --git a/templates/ftp/syslog_bridge.py b/decnet/templates/ftp/syslog_bridge.py similarity index 100% rename from templates/ftp/syslog_bridge.py rename to decnet/templates/ftp/syslog_bridge.py diff --git a/templates/http/Dockerfile b/decnet/templates/http/Dockerfile similarity index 100% rename from templates/http/Dockerfile rename to decnet/templates/http/Dockerfile diff --git a/templates/http/entrypoint.sh b/decnet/templates/http/entrypoint.sh similarity index 100% rename from templates/http/entrypoint.sh rename to decnet/templates/http/entrypoint.sh diff --git a/templates/http/server.py b/decnet/templates/http/server.py similarity index 100% rename from templates/http/server.py rename to decnet/templates/http/server.py diff --git a/templates/http/syslog_bridge.py b/decnet/templates/http/syslog_bridge.py similarity index 100% rename from templates/http/syslog_bridge.py rename to decnet/templates/http/syslog_bridge.py diff --git a/templates/https/Dockerfile b/decnet/templates/https/Dockerfile similarity index 100% rename from templates/https/Dockerfile rename to decnet/templates/https/Dockerfile diff --git a/templates/https/entrypoint.sh b/decnet/templates/https/entrypoint.sh similarity index 100% rename from templates/https/entrypoint.sh rename to decnet/templates/https/entrypoint.sh diff --git a/templates/https/server.py b/decnet/templates/https/server.py similarity index 100% rename from templates/https/server.py rename to decnet/templates/https/server.py diff --git a/templates/https/syslog_bridge.py b/decnet/templates/https/syslog_bridge.py similarity index 100% rename from templates/https/syslog_bridge.py rename to decnet/templates/https/syslog_bridge.py diff --git a/templates/imap/Dockerfile b/decnet/templates/imap/Dockerfile similarity index 100% rename from templates/imap/Dockerfile rename to decnet/templates/imap/Dockerfile diff --git a/templates/imap/entrypoint.sh b/decnet/templates/imap/entrypoint.sh similarity index 100% rename from templates/imap/entrypoint.sh rename to decnet/templates/imap/entrypoint.sh diff --git a/templates/imap/server.py b/decnet/templates/imap/server.py similarity index 100% rename from templates/imap/server.py rename to decnet/templates/imap/server.py diff --git a/templates/imap/syslog_bridge.py b/decnet/templates/imap/syslog_bridge.py similarity index 100% rename from templates/imap/syslog_bridge.py rename to decnet/templates/imap/syslog_bridge.py diff --git a/templates/k8s/Dockerfile b/decnet/templates/k8s/Dockerfile similarity index 100% rename from templates/k8s/Dockerfile rename to decnet/templates/k8s/Dockerfile diff --git a/templates/k8s/entrypoint.sh b/decnet/templates/k8s/entrypoint.sh similarity index 100% rename from templates/k8s/entrypoint.sh rename to decnet/templates/k8s/entrypoint.sh diff --git a/templates/k8s/server.py b/decnet/templates/k8s/server.py similarity index 100% rename from templates/k8s/server.py rename to decnet/templates/k8s/server.py diff --git a/templates/k8s/syslog_bridge.py b/decnet/templates/k8s/syslog_bridge.py similarity index 100% rename from templates/k8s/syslog_bridge.py rename to decnet/templates/k8s/syslog_bridge.py diff --git a/templates/ldap/Dockerfile b/decnet/templates/ldap/Dockerfile similarity index 100% rename from templates/ldap/Dockerfile rename to decnet/templates/ldap/Dockerfile diff --git a/templates/ldap/entrypoint.sh b/decnet/templates/ldap/entrypoint.sh similarity index 100% rename from templates/ldap/entrypoint.sh rename to decnet/templates/ldap/entrypoint.sh diff --git a/templates/ldap/server.py b/decnet/templates/ldap/server.py similarity index 100% rename from templates/ldap/server.py rename to decnet/templates/ldap/server.py diff --git a/templates/ldap/syslog_bridge.py b/decnet/templates/ldap/syslog_bridge.py similarity index 100% rename from templates/ldap/syslog_bridge.py rename to decnet/templates/ldap/syslog_bridge.py diff --git a/templates/llmnr/Dockerfile b/decnet/templates/llmnr/Dockerfile similarity index 100% rename from templates/llmnr/Dockerfile rename to decnet/templates/llmnr/Dockerfile diff --git a/templates/llmnr/entrypoint.sh b/decnet/templates/llmnr/entrypoint.sh similarity index 100% rename from templates/llmnr/entrypoint.sh rename to decnet/templates/llmnr/entrypoint.sh diff --git a/templates/llmnr/server.py b/decnet/templates/llmnr/server.py similarity index 100% rename from templates/llmnr/server.py rename to decnet/templates/llmnr/server.py diff --git a/templates/llmnr/syslog_bridge.py b/decnet/templates/llmnr/syslog_bridge.py similarity index 100% rename from templates/llmnr/syslog_bridge.py rename to decnet/templates/llmnr/syslog_bridge.py diff --git a/templates/mongodb/Dockerfile b/decnet/templates/mongodb/Dockerfile similarity index 100% rename from templates/mongodb/Dockerfile rename to decnet/templates/mongodb/Dockerfile diff --git a/templates/mongodb/entrypoint.sh b/decnet/templates/mongodb/entrypoint.sh similarity index 100% rename from templates/mongodb/entrypoint.sh rename to decnet/templates/mongodb/entrypoint.sh diff --git a/templates/mongodb/server.py b/decnet/templates/mongodb/server.py similarity index 100% rename from templates/mongodb/server.py rename to decnet/templates/mongodb/server.py diff --git a/templates/mongodb/syslog_bridge.py b/decnet/templates/mongodb/syslog_bridge.py similarity index 100% rename from templates/mongodb/syslog_bridge.py rename to decnet/templates/mongodb/syslog_bridge.py diff --git a/templates/mqtt/Dockerfile b/decnet/templates/mqtt/Dockerfile similarity index 100% rename from templates/mqtt/Dockerfile rename to decnet/templates/mqtt/Dockerfile diff --git a/templates/mqtt/entrypoint.sh b/decnet/templates/mqtt/entrypoint.sh similarity index 100% rename from templates/mqtt/entrypoint.sh rename to decnet/templates/mqtt/entrypoint.sh diff --git a/templates/mqtt/server.py b/decnet/templates/mqtt/server.py similarity index 100% rename from templates/mqtt/server.py rename to decnet/templates/mqtt/server.py diff --git a/templates/mqtt/syslog_bridge.py b/decnet/templates/mqtt/syslog_bridge.py similarity index 100% rename from templates/mqtt/syslog_bridge.py rename to decnet/templates/mqtt/syslog_bridge.py diff --git a/templates/mssql/Dockerfile b/decnet/templates/mssql/Dockerfile similarity index 100% rename from templates/mssql/Dockerfile rename to decnet/templates/mssql/Dockerfile diff --git a/templates/mssql/entrypoint.sh b/decnet/templates/mssql/entrypoint.sh similarity index 100% rename from templates/mssql/entrypoint.sh rename to decnet/templates/mssql/entrypoint.sh diff --git a/templates/mssql/server.py b/decnet/templates/mssql/server.py similarity index 100% rename from templates/mssql/server.py rename to decnet/templates/mssql/server.py diff --git a/templates/mssql/syslog_bridge.py b/decnet/templates/mssql/syslog_bridge.py similarity index 100% rename from templates/mssql/syslog_bridge.py rename to decnet/templates/mssql/syslog_bridge.py diff --git a/templates/mysql/Dockerfile b/decnet/templates/mysql/Dockerfile similarity index 100% rename from templates/mysql/Dockerfile rename to decnet/templates/mysql/Dockerfile diff --git a/templates/mysql/entrypoint.sh b/decnet/templates/mysql/entrypoint.sh similarity index 100% rename from templates/mysql/entrypoint.sh rename to decnet/templates/mysql/entrypoint.sh diff --git a/templates/mysql/server.py b/decnet/templates/mysql/server.py similarity index 100% rename from templates/mysql/server.py rename to decnet/templates/mysql/server.py diff --git a/templates/mysql/syslog_bridge.py b/decnet/templates/mysql/syslog_bridge.py similarity index 100% rename from templates/mysql/syslog_bridge.py rename to decnet/templates/mysql/syslog_bridge.py diff --git a/templates/pop3/Dockerfile b/decnet/templates/pop3/Dockerfile similarity index 100% rename from templates/pop3/Dockerfile rename to decnet/templates/pop3/Dockerfile diff --git a/templates/pop3/entrypoint.sh b/decnet/templates/pop3/entrypoint.sh similarity index 100% rename from templates/pop3/entrypoint.sh rename to decnet/templates/pop3/entrypoint.sh diff --git a/templates/pop3/server.py b/decnet/templates/pop3/server.py similarity index 100% rename from templates/pop3/server.py rename to decnet/templates/pop3/server.py diff --git a/templates/pop3/syslog_bridge.py b/decnet/templates/pop3/syslog_bridge.py similarity index 100% rename from templates/pop3/syslog_bridge.py rename to decnet/templates/pop3/syslog_bridge.py diff --git a/templates/postgres/Dockerfile b/decnet/templates/postgres/Dockerfile similarity index 100% rename from templates/postgres/Dockerfile rename to decnet/templates/postgres/Dockerfile diff --git a/templates/postgres/entrypoint.sh b/decnet/templates/postgres/entrypoint.sh similarity index 100% rename from templates/postgres/entrypoint.sh rename to decnet/templates/postgres/entrypoint.sh diff --git a/templates/postgres/server.py b/decnet/templates/postgres/server.py similarity index 100% rename from templates/postgres/server.py rename to decnet/templates/postgres/server.py diff --git a/templates/postgres/syslog_bridge.py b/decnet/templates/postgres/syslog_bridge.py similarity index 100% rename from templates/postgres/syslog_bridge.py rename to decnet/templates/postgres/syslog_bridge.py diff --git a/templates/rdp/Dockerfile b/decnet/templates/rdp/Dockerfile similarity index 100% rename from templates/rdp/Dockerfile rename to decnet/templates/rdp/Dockerfile diff --git a/templates/rdp/entrypoint.sh b/decnet/templates/rdp/entrypoint.sh similarity index 100% rename from templates/rdp/entrypoint.sh rename to decnet/templates/rdp/entrypoint.sh diff --git a/templates/rdp/server.py b/decnet/templates/rdp/server.py similarity index 100% rename from templates/rdp/server.py rename to decnet/templates/rdp/server.py diff --git a/templates/rdp/syslog_bridge.py b/decnet/templates/rdp/syslog_bridge.py similarity index 100% rename from templates/rdp/syslog_bridge.py rename to decnet/templates/rdp/syslog_bridge.py diff --git a/templates/redis/Dockerfile b/decnet/templates/redis/Dockerfile similarity index 100% rename from templates/redis/Dockerfile rename to decnet/templates/redis/Dockerfile diff --git a/templates/redis/entrypoint.sh b/decnet/templates/redis/entrypoint.sh similarity index 100% rename from templates/redis/entrypoint.sh rename to decnet/templates/redis/entrypoint.sh diff --git a/templates/redis/server.py b/decnet/templates/redis/server.py similarity index 100% rename from templates/redis/server.py rename to decnet/templates/redis/server.py diff --git a/templates/redis/syslog_bridge.py b/decnet/templates/redis/syslog_bridge.py similarity index 100% rename from templates/redis/syslog_bridge.py rename to decnet/templates/redis/syslog_bridge.py diff --git a/templates/sip/Dockerfile b/decnet/templates/sip/Dockerfile similarity index 100% rename from templates/sip/Dockerfile rename to decnet/templates/sip/Dockerfile diff --git a/templates/sip/entrypoint.sh b/decnet/templates/sip/entrypoint.sh similarity index 100% rename from templates/sip/entrypoint.sh rename to decnet/templates/sip/entrypoint.sh diff --git a/templates/sip/server.py b/decnet/templates/sip/server.py similarity index 100% rename from templates/sip/server.py rename to decnet/templates/sip/server.py diff --git a/templates/sip/syslog_bridge.py b/decnet/templates/sip/syslog_bridge.py similarity index 100% rename from templates/sip/syslog_bridge.py rename to decnet/templates/sip/syslog_bridge.py diff --git a/templates/smb/Dockerfile b/decnet/templates/smb/Dockerfile similarity index 100% rename from templates/smb/Dockerfile rename to decnet/templates/smb/Dockerfile diff --git a/templates/smb/entrypoint.sh b/decnet/templates/smb/entrypoint.sh similarity index 100% rename from templates/smb/entrypoint.sh rename to decnet/templates/smb/entrypoint.sh diff --git a/templates/smb/server.py b/decnet/templates/smb/server.py similarity index 100% rename from templates/smb/server.py rename to decnet/templates/smb/server.py diff --git a/templates/smb/syslog_bridge.py b/decnet/templates/smb/syslog_bridge.py similarity index 100% rename from templates/smb/syslog_bridge.py rename to decnet/templates/smb/syslog_bridge.py diff --git a/templates/smtp/Dockerfile b/decnet/templates/smtp/Dockerfile similarity index 100% rename from templates/smtp/Dockerfile rename to decnet/templates/smtp/Dockerfile diff --git a/templates/smtp/entrypoint.sh b/decnet/templates/smtp/entrypoint.sh similarity index 100% rename from templates/smtp/entrypoint.sh rename to decnet/templates/smtp/entrypoint.sh diff --git a/templates/smtp/server.py b/decnet/templates/smtp/server.py similarity index 100% rename from templates/smtp/server.py rename to decnet/templates/smtp/server.py diff --git a/templates/smtp/syslog_bridge.py b/decnet/templates/smtp/syslog_bridge.py similarity index 100% rename from templates/smtp/syslog_bridge.py rename to decnet/templates/smtp/syslog_bridge.py diff --git a/templates/sniffer/Dockerfile b/decnet/templates/sniffer/Dockerfile similarity index 100% rename from templates/sniffer/Dockerfile rename to decnet/templates/sniffer/Dockerfile diff --git a/templates/sniffer/server.py b/decnet/templates/sniffer/server.py similarity index 100% rename from templates/sniffer/server.py rename to decnet/templates/sniffer/server.py diff --git a/templates/snmp/Dockerfile b/decnet/templates/snmp/Dockerfile similarity index 100% rename from templates/snmp/Dockerfile rename to decnet/templates/snmp/Dockerfile diff --git a/templates/snmp/entrypoint.sh b/decnet/templates/snmp/entrypoint.sh similarity index 100% rename from templates/snmp/entrypoint.sh rename to decnet/templates/snmp/entrypoint.sh diff --git a/templates/snmp/server.py b/decnet/templates/snmp/server.py similarity index 100% rename from templates/snmp/server.py rename to decnet/templates/snmp/server.py diff --git a/templates/snmp/syslog_bridge.py b/decnet/templates/snmp/syslog_bridge.py similarity index 100% rename from templates/snmp/syslog_bridge.py rename to decnet/templates/snmp/syslog_bridge.py diff --git a/templates/ssh/Dockerfile b/decnet/templates/ssh/Dockerfile similarity index 100% rename from templates/ssh/Dockerfile rename to decnet/templates/ssh/Dockerfile diff --git a/templates/ssh/_build_stealth.py b/decnet/templates/ssh/_build_stealth.py similarity index 100% rename from templates/ssh/_build_stealth.py rename to decnet/templates/ssh/_build_stealth.py diff --git a/templates/ssh/argv_zap.c b/decnet/templates/ssh/argv_zap.c similarity index 100% rename from templates/ssh/argv_zap.c rename to decnet/templates/ssh/argv_zap.c diff --git a/templates/ssh/capture.sh b/decnet/templates/ssh/capture.sh similarity index 100% rename from templates/ssh/capture.sh rename to decnet/templates/ssh/capture.sh diff --git a/templates/ssh/emit_capture.py b/decnet/templates/ssh/emit_capture.py similarity index 100% rename from templates/ssh/emit_capture.py rename to decnet/templates/ssh/emit_capture.py diff --git a/templates/ssh/entrypoint.sh b/decnet/templates/ssh/entrypoint.sh similarity index 100% rename from templates/ssh/entrypoint.sh rename to decnet/templates/ssh/entrypoint.sh diff --git a/templates/ssh/syslog_bridge.py b/decnet/templates/ssh/syslog_bridge.py similarity index 100% rename from templates/ssh/syslog_bridge.py rename to decnet/templates/ssh/syslog_bridge.py diff --git a/templates/syslog_bridge.py b/decnet/templates/syslog_bridge.py similarity index 100% rename from templates/syslog_bridge.py rename to decnet/templates/syslog_bridge.py diff --git a/templates/telnet/Dockerfile b/decnet/templates/telnet/Dockerfile similarity index 100% rename from templates/telnet/Dockerfile rename to decnet/templates/telnet/Dockerfile diff --git a/templates/telnet/entrypoint.sh b/decnet/templates/telnet/entrypoint.sh similarity index 100% rename from templates/telnet/entrypoint.sh rename to decnet/templates/telnet/entrypoint.sh diff --git a/templates/telnet/syslog_bridge.py b/decnet/templates/telnet/syslog_bridge.py similarity index 100% rename from templates/telnet/syslog_bridge.py rename to decnet/templates/telnet/syslog_bridge.py diff --git a/templates/tftp/Dockerfile b/decnet/templates/tftp/Dockerfile similarity index 100% rename from templates/tftp/Dockerfile rename to decnet/templates/tftp/Dockerfile diff --git a/templates/tftp/entrypoint.sh b/decnet/templates/tftp/entrypoint.sh similarity index 100% rename from templates/tftp/entrypoint.sh rename to decnet/templates/tftp/entrypoint.sh diff --git a/templates/tftp/server.py b/decnet/templates/tftp/server.py similarity index 100% rename from templates/tftp/server.py rename to decnet/templates/tftp/server.py diff --git a/templates/tftp/syslog_bridge.py b/decnet/templates/tftp/syslog_bridge.py similarity index 100% rename from templates/tftp/syslog_bridge.py rename to decnet/templates/tftp/syslog_bridge.py diff --git a/templates/vnc/Dockerfile b/decnet/templates/vnc/Dockerfile similarity index 100% rename from templates/vnc/Dockerfile rename to decnet/templates/vnc/Dockerfile diff --git a/templates/vnc/entrypoint.sh b/decnet/templates/vnc/entrypoint.sh similarity index 100% rename from templates/vnc/entrypoint.sh rename to decnet/templates/vnc/entrypoint.sh diff --git a/templates/vnc/server.py b/decnet/templates/vnc/server.py similarity index 100% rename from templates/vnc/server.py rename to decnet/templates/vnc/server.py diff --git a/templates/vnc/syslog_bridge.py b/decnet/templates/vnc/syslog_bridge.py similarity index 100% rename from templates/vnc/syslog_bridge.py rename to decnet/templates/vnc/syslog_bridge.py diff --git a/pyproject.toml b/pyproject.toml index 9618637..6a364f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,7 @@ filterwarnings = [ [tool.coverage.run] source = ["decnet"] -omit = ["*/tests/*", "templates/*"] +omit = ["*/tests/*", "*/templates/*"] parallel = true [tool.coverage.report] @@ -105,7 +105,12 @@ skip_covered = false where = ["."] include = ["decnet*"] +[tool.setuptools.package-data] +# Ship docker build contexts + syslog_bridge.py as package data so they land +# in site-packages when agents install the bundle via `pip install`. +decnet = ["templates/**/*"] + [tool.bandit] exclude_dirs = [ - "templates/syslog_bridge.py", + "decnet/templates/syslog_bridge.py", ] diff --git a/tests/test_sniffer_ja3.py b/tests/test_sniffer_ja3.py index a087436..969f728 100644 --- a/tests/test_sniffer_ja3.py +++ b/tests/test_sniffer_ja3.py @@ -18,7 +18,7 @@ import pytest # ─── Import sniffer module with mocked syslog_bridge ───────────────────────── -_SNIFFER_DIR = str(Path(__file__).parent.parent / "templates" / "sniffer") +_SNIFFER_DIR = str(Path(__file__).parent.parent / "decnet" / "templates" / "sniffer") def _load_sniffer(): """Load templates/sniffer/server.py with syslog_bridge stubbed out.""" diff --git a/tests/test_ssh_capture_emit.py b/tests/test_ssh_capture_emit.py index 9bc4a19..5f3d4cf 100644 --- a/tests/test_ssh_capture_emit.py +++ b/tests/test_ssh_capture_emit.py @@ -19,7 +19,7 @@ import pytest from decnet.collector.worker import parse_rfc5424 -_TEMPLATE_DIR = Path(__file__).resolve().parent.parent / "templates" / "ssh" +_TEMPLATE_DIR = Path(__file__).resolve().parent.parent / "decnet" / "templates" / "ssh" _EMIT_SCRIPT = _TEMPLATE_DIR / "emit_capture.py"