diff --git a/cmd/backup.go b/cmd/backup.go index 7215571..e02d65e 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -5,10 +5,10 @@ import ( "os" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/env" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/targz" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/internal/env" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/targz" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/blind_update.go b/cmd/blind_update.go index 55d8e48..24ac3cf 100644 --- a/cmd/blind_update.go +++ b/cmd/blind_update.go @@ -2,8 +2,8 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/execx" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/execx" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go index 12cbece..b4e8e4f 100644 --- a/cmd/bootstrap.go +++ b/cmd/bootstrap.go @@ -7,13 +7,13 @@ import ( "path/filepath" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" cfg "github.com/FAU-CDI/wisski-distillery/internal/config" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" - "github.com/FAU-CDI/wisski-distillery/internal/hostname" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/password" - "github.com/FAU-CDI/wisski-distillery/internal/unpack" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/hostname" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/password" + "github.com/FAU-CDI/wisski-distillery/pkg/unpack" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/config.go b/cmd/config.go index e9ced84..1189277 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -2,7 +2,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" ) // Config is the configuration command diff --git a/cmd/cron.go b/cmd/cron.go index 06421e1..74b9c47 100644 --- a/cmd/cron.go +++ b/cmd/cron.go @@ -2,8 +2,8 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/info.go b/cmd/info.go index 150ca54..ac0848d 100644 --- a/cmd/info.go +++ b/cmd/info.go @@ -2,7 +2,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" ) // Info is then 'info' command diff --git a/cmd/license.go b/cmd/license.go index a29b324..8afb144 100644 --- a/cmd/license.go +++ b/cmd/license.go @@ -2,7 +2,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/FAU-CDI/wisski-distillery/internal/legal" ) diff --git a/cmd/ls.go b/cmd/ls.go index bcb4ed4..1e0d952 100644 --- a/cmd/ls.go +++ b/cmd/ls.go @@ -2,7 +2,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" ) // Ls is the 'ls' command diff --git a/cmd/make_mysql_account.go b/cmd/make_mysql_account.go index 30ef6d2..d0ff5b5 100644 --- a/cmd/make_mysql_account.go +++ b/cmd/make_mysql_account.go @@ -4,8 +4,8 @@ import ( "fmt" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/sqle" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/sqle" "github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/parser" ) diff --git a/cmd/monday.go b/cmd/monday.go index 02cc9ed..e62e525 100644 --- a/cmd/monday.go +++ b/cmd/monday.go @@ -4,8 +4,8 @@ import ( "os" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" ) // Monday is the 'monday' command diff --git a/cmd/mysql.go b/cmd/mysql.go index ace11c8..dad794f 100644 --- a/cmd/mysql.go +++ b/cmd/mysql.go @@ -4,7 +4,7 @@ import ( "fmt" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/parser" ) diff --git a/cmd/provision.go b/cmd/provision.go index 01ab371..e5ca3b7 100644 --- a/cmd/provision.go +++ b/cmd/provision.go @@ -2,9 +2,9 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/purge.go b/cmd/purge.go index 7811cd0..dcb67d8 100644 --- a/cmd/purge.go +++ b/cmd/purge.go @@ -4,9 +4,9 @@ import ( "os" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/env" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/internal/env" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/rebuild.go b/cmd/rebuild.go index ca1442d..38f90ef 100644 --- a/cmd/rebuild.go +++ b/cmd/rebuild.go @@ -2,9 +2,9 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/reserve.go b/cmd/reserve.go index 52eef37..e95f9f1 100644 --- a/cmd/reserve.go +++ b/cmd/reserve.go @@ -2,10 +2,10 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/servers.go b/cmd/servers.go index ba5ec59..579145e 100644 --- a/cmd/servers.go +++ b/cmd/servers.go @@ -4,7 +4,7 @@ import ( "net/http" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/shell.go b/cmd/shell.go index f22af7a..c57faeb 100644 --- a/cmd/shell.go +++ b/cmd/shell.go @@ -4,7 +4,7 @@ import ( "fmt" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/parser" ) diff --git a/cmd/snapshot.go b/cmd/snapshot.go index 70acaeb..f48b6fc 100644 --- a/cmd/snapshot.go +++ b/cmd/snapshot.go @@ -5,10 +5,10 @@ import ( "os" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/env" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/targz" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/internal/env" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/targz" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/system_update.go b/cmd/system_update.go index 304846f..2369238 100644 --- a/cmd/system_update.go +++ b/cmd/system_update.go @@ -4,11 +4,11 @@ import ( "os" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/execx" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/unpack" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/execx" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/unpack" "github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/parser" ) diff --git a/cmd/update_prefix_config.go b/cmd/update_prefix_config.go index 6d5ee83..77eb5fd 100644 --- a/cmd/update_prefix_config.go +++ b/cmd/update_prefix_config.go @@ -5,8 +5,8 @@ import ( "os" wisski_distillery "github.com/FAU-CDI/wisski-distillery" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/wdcli/main.go b/cmd/wdcli/main.go index 3c64d73..23d11f3 100644 --- a/cmd/wdcli/main.go +++ b/cmd/wdcli/main.go @@ -8,7 +8,7 @@ import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" "github.com/FAU-CDI/wisski-distillery/cmd" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/stream" ) diff --git a/component/component.go b/internal/component/component.go similarity index 97% rename from component/component.go rename to internal/component/component.go index d8b60ed..ce14ca2 100644 --- a/component/component.go +++ b/internal/component/component.go @@ -23,7 +23,7 @@ type Component interface { Name() string // Path returns the path this component is installed at. - // By convention it is /var/www/deploy/core/${Name()} + // By convention it is /var/www/deploy/internal/core/${Name()} Path() string // Stack can be used to gain access to the "docker compose" stack. diff --git a/component/dis/dis.env b/internal/component/dis/dis.env similarity index 100% rename from component/dis/dis.env rename to internal/component/dis/dis.env diff --git a/component/dis/dis.go b/internal/component/dis/dis.go similarity index 90% rename from component/dis/dis.go rename to internal/component/dis/dis.go index 65fc8d5..9b1bcb7 100644 --- a/component/dis/dis.go +++ b/internal/component/dis/dis.go @@ -3,8 +3,8 @@ package dis import ( "embed" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/core" ) type Dis struct { diff --git a/component/dis/stack/Dockerfile b/internal/component/dis/stack/Dockerfile similarity index 100% rename from component/dis/stack/Dockerfile rename to internal/component/dis/stack/Dockerfile diff --git a/component/dis/stack/docker-compose.yml b/internal/component/dis/stack/docker-compose.yml similarity index 100% rename from component/dis/stack/docker-compose.yml rename to internal/component/dis/stack/docker-compose.yml diff --git a/component/installable.go b/internal/component/installable.go similarity index 96% rename from component/installable.go rename to internal/component/installable.go index bcca104..c503e7a 100644 --- a/component/installable.go +++ b/internal/component/installable.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" - "github.com/FAU-CDI/wisski-distillery/internal/unpack" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/unpack" "github.com/pkg/errors" "github.com/tkw1536/goprogram/stream" ) diff --git a/component/resolver/resolver.env b/internal/component/resolver/resolver.env similarity index 100% rename from component/resolver/resolver.env rename to internal/component/resolver/resolver.env diff --git a/component/resolver/resolver.go b/internal/component/resolver/resolver.go similarity index 96% rename from component/resolver/resolver.go rename to internal/component/resolver/resolver.go index d5514f9..b8b17de 100644 --- a/component/resolver/resolver.go +++ b/internal/component/resolver/resolver.go @@ -9,8 +9,8 @@ import ( "github.com/FAU-CDI/wdresolve" "github.com/FAU-CDI/wdresolve/resolvers" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/core" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/tkw1536/goprogram/stream" ) diff --git a/component/resolver/stack/Dockerfile b/internal/component/resolver/stack/Dockerfile similarity index 100% rename from component/resolver/stack/Dockerfile rename to internal/component/resolver/stack/Dockerfile diff --git a/component/resolver/stack/docker-compose.yml b/internal/component/resolver/stack/docker-compose.yml similarity index 100% rename from component/resolver/stack/docker-compose.yml rename to internal/component/resolver/stack/docker-compose.yml diff --git a/component/self/self.env b/internal/component/self/self.env similarity index 100% rename from component/self/self.env rename to internal/component/self/self.env diff --git a/component/self/self.go b/internal/component/self/self.go similarity index 93% rename from component/self/self.go rename to internal/component/self/self.go index c9cb5c7..e9aef1e 100644 --- a/component/self/self.go +++ b/internal/component/self/self.go @@ -3,7 +3,7 @@ package self import ( "embed" - "github.com/FAU-CDI/wisski-distillery/component" + "github.com/FAU-CDI/wisski-distillery/internal/component" ) type Self struct { diff --git a/component/self/stack/docker-compose.yml b/internal/component/self/stack/docker-compose.yml similarity index 100% rename from component/self/stack/docker-compose.yml rename to internal/component/self/stack/docker-compose.yml diff --git a/component/sql/database.go b/internal/component/sql/database.go similarity index 96% rename from component/sql/database.go rename to internal/component/sql/database.go index 344b72f..09d8faf 100644 --- a/component/sql/database.go +++ b/internal/component/sql/database.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "github.com/FAU-CDI/wisski-distillery/internal/bookkeeping" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/sqle" - "github.com/FAU-CDI/wisski-distillery/internal/wait" + "github.com/FAU-CDI/wisski-distillery/pkg/bookkeeping" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/sqle" + "github.com/FAU-CDI/wisski-distillery/pkg/wait" "github.com/tkw1536/goprogram/stream" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/component/sql/sql.go b/internal/component/sql/sql.go similarity index 91% rename from component/sql/sql.go rename to internal/component/sql/sql.go index 52471e6..4ad10b6 100644 --- a/component/sql/sql.go +++ b/internal/component/sql/sql.go @@ -6,7 +6,7 @@ import ( "io/fs" "time" - "github.com/FAU-CDI/wisski-distillery/component" + "github.com/FAU-CDI/wisski-distillery/internal/component" ) type SQL struct { diff --git a/component/sql/stack/docker-compose.yml b/internal/component/sql/stack/docker-compose.yml similarity index 100% rename from component/sql/stack/docker-compose.yml rename to internal/component/sql/stack/docker-compose.yml diff --git a/component/ssh/ssh.go b/internal/component/ssh/ssh.go similarity index 84% rename from component/ssh/ssh.go rename to internal/component/ssh/ssh.go index dc9d2d6..db17166 100644 --- a/component/ssh/ssh.go +++ b/internal/component/ssh/ssh.go @@ -3,7 +3,7 @@ package ssh import ( "embed" - "github.com/FAU-CDI/wisski-distillery/component" + "github.com/FAU-CDI/wisski-distillery/internal/component" ) type SSH struct { diff --git a/component/ssh/stack/docker-compose.yml b/internal/component/ssh/stack/docker-compose.yml similarity index 100% rename from component/ssh/stack/docker-compose.yml rename to internal/component/ssh/stack/docker-compose.yml diff --git a/component/stack.go b/internal/component/stack.go similarity index 98% rename from component/stack.go rename to internal/component/stack.go index dbe979d..3039ba1 100644 --- a/component/stack.go +++ b/internal/component/stack.go @@ -4,7 +4,7 @@ package component import ( "errors" - "github.com/FAU-CDI/wisski-distillery/internal/execx" + "github.com/FAU-CDI/wisski-distillery/pkg/execx" "github.com/tkw1536/goprogram/stream" ) diff --git a/component/triplestore/create-repo.ttl b/internal/component/triplestore/create-repo.ttl similarity index 100% rename from component/triplestore/create-repo.ttl rename to internal/component/triplestore/create-repo.ttl diff --git a/component/triplestore/database.go b/internal/component/triplestore/database.go similarity index 98% rename from component/triplestore/database.go rename to internal/component/triplestore/database.go index 1c61bbb..f5274ca 100644 --- a/component/triplestore/database.go +++ b/internal/component/triplestore/database.go @@ -11,8 +11,8 @@ import ( "os" "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/wait" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/wait" "github.com/pkg/errors" "github.com/tkw1536/goprogram/stream" ) diff --git a/component/triplestore/provision.go b/internal/component/triplestore/provision.go similarity index 96% rename from component/triplestore/provision.go rename to internal/component/triplestore/provision.go index 38f1a11..4be6266 100644 --- a/component/triplestore/provision.go +++ b/internal/component/triplestore/provision.go @@ -6,7 +6,7 @@ import ( _ "embed" - "github.com/FAU-CDI/wisski-distillery/internal/unpack" + "github.com/FAU-CDI/wisski-distillery/pkg/unpack" "github.com/tkw1536/goprogram/exit" ) diff --git a/component/triplestore/stack/.dockerignore b/internal/component/triplestore/stack/.dockerignore similarity index 100% rename from component/triplestore/stack/.dockerignore rename to internal/component/triplestore/stack/.dockerignore diff --git a/component/triplestore/stack/Dockerfile b/internal/component/triplestore/stack/Dockerfile similarity index 100% rename from component/triplestore/stack/Dockerfile rename to internal/component/triplestore/stack/Dockerfile diff --git a/component/triplestore/stack/docker-compose.yml b/internal/component/triplestore/stack/docker-compose.yml similarity index 100% rename from component/triplestore/stack/docker-compose.yml rename to internal/component/triplestore/stack/docker-compose.yml diff --git a/component/triplestore/stack/entrypoint.sh b/internal/component/triplestore/stack/entrypoint.sh similarity index 100% rename from component/triplestore/stack/entrypoint.sh rename to internal/component/triplestore/stack/entrypoint.sh diff --git a/component/triplestore/triplestore.go b/internal/component/triplestore/triplestore.go similarity index 93% rename from component/triplestore/triplestore.go rename to internal/component/triplestore/triplestore.go index b5da9f8..b3ced1c 100644 --- a/component/triplestore/triplestore.go +++ b/internal/component/triplestore/triplestore.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/component" + "github.com/FAU-CDI/wisski-distillery/internal/component" ) type Triplestore struct { diff --git a/component/web/stack/docker-compose.yml b/internal/component/web/stack/docker-compose.yml similarity index 100% rename from component/web/stack/docker-compose.yml rename to internal/component/web/stack/docker-compose.yml diff --git a/component/web/stack/global.conf b/internal/component/web/stack/global.conf similarity index 100% rename from component/web/stack/global.conf rename to internal/component/web/stack/global.conf diff --git a/component/web/stack/proxy.conf b/internal/component/web/stack/proxy.conf similarity index 100% rename from component/web/stack/proxy.conf rename to internal/component/web/stack/proxy.conf diff --git a/component/web/web.env b/internal/component/web/web.env similarity index 100% rename from component/web/web.env rename to internal/component/web/web.env diff --git a/component/web/web.go b/internal/component/web/web.go similarity index 91% rename from component/web/web.go rename to internal/component/web/web.go index df6a8ee..4bc7882 100644 --- a/component/web/web.go +++ b/internal/component/web/web.go @@ -3,7 +3,7 @@ package web import ( "embed" - "github.com/FAU-CDI/wisski-distillery/component" + "github.com/FAU-CDI/wisski-distillery/internal/component" ) // Web implements the web component diff --git a/internal/config/password.go b/internal/config/password.go index 53a27a9..e44dd25 100644 --- a/internal/config/password.go +++ b/internal/config/password.go @@ -1,6 +1,6 @@ package config -import "github.com/FAU-CDI/wisski-distillery/internal/password" +import "github.com/FAU-CDI/wisski-distillery/pkg/password" // NewPassword returns a new password using the password settings from this configuration func (cfg Config) NewPassword() (string, error) { diff --git a/internal/config/validators.go b/internal/config/validators.go index f3397af..20fbbaf 100644 --- a/internal/config/validators.go +++ b/internal/config/validators.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/pkg/errors" ) diff --git a/core/bootstrap.go b/internal/core/bootstrap.go similarity index 100% rename from core/bootstrap.go rename to internal/core/bootstrap.go diff --git a/core/bootstrap/env b/internal/core/bootstrap/env similarity index 100% rename from core/bootstrap/env rename to internal/core/bootstrap/env diff --git a/core/bootstrap/global_authorized_keys b/internal/core/bootstrap/global_authorized_keys similarity index 100% rename from core/bootstrap/global_authorized_keys rename to internal/core/bootstrap/global_authorized_keys diff --git a/core/bootstrap/overrides.json b/internal/core/bootstrap/overrides.json similarity index 100% rename from core/bootstrap/overrides.json rename to internal/core/bootstrap/overrides.json diff --git a/core/core.go b/internal/core/core.go similarity index 100% rename from core/core.go rename to internal/core/core.go diff --git a/core/flags.go b/internal/core/flags.go similarity index 100% rename from core/flags.go rename to internal/core/flags.go diff --git a/core/meta.go b/internal/core/meta.go similarity index 100% rename from core/meta.go rename to internal/core/meta.go diff --git a/core/params.go b/internal/core/params.go similarity index 100% rename from core/params.go rename to internal/core/params.go diff --git a/core/requirements.go b/internal/core/requirements.go similarity index 100% rename from core/requirements.go rename to internal/core/requirements.go diff --git a/core/runtime.go b/internal/core/runtime.go similarity index 93% rename from core/runtime.go rename to internal/core/runtime.go index c38de9d..486b996 100644 --- a/core/runtime.go +++ b/internal/core/runtime.go @@ -2,7 +2,6 @@ package core import ( "embed" - _ "embed" ) // Runtime contains runtime resources to be installed into any instance diff --git a/core/runtime/README b/internal/core/runtime/README similarity index 100% rename from core/runtime/README rename to internal/core/runtime/README diff --git a/core/runtime/blind_update.sh b/internal/core/runtime/blind_update.sh similarity index 100% rename from core/runtime/blind_update.sh rename to internal/core/runtime/blind_update.sh diff --git a/core/runtime/create_admin.sh b/internal/core/runtime/create_admin.sh similarity index 100% rename from core/runtime/create_admin.sh rename to internal/core/runtime/create_admin.sh diff --git a/core/runtime/cron.sh b/internal/core/runtime/cron.sh similarity index 100% rename from core/runtime/cron.sh rename to internal/core/runtime/cron.sh diff --git a/core/runtime/install_colorbox.sh b/internal/core/runtime/install_colorbox.sh similarity index 100% rename from core/runtime/install_colorbox.sh rename to internal/core/runtime/install_colorbox.sh diff --git a/core/runtime/patch_easyrdf.sh b/internal/core/runtime/patch_easyrdf.sh similarity index 100% rename from core/runtime/patch_easyrdf.sh rename to internal/core/runtime/patch_easyrdf.sh diff --git a/core/runtime/patch_triples.sh b/internal/core/runtime/patch_triples.sh similarity index 100% rename from core/runtime/patch_triples.sh rename to internal/core/runtime/patch_triples.sh diff --git a/core/runtime/use_wisski.sh b/internal/core/runtime/use_wisski.sh similarity index 100% rename from core/runtime/use_wisski.sh rename to internal/core/runtime/use_wisski.sh diff --git a/core/runtime/wisski_2x_3x.sh b/internal/core/runtime/wisski_2x_3x.sh similarity index 76% rename from core/runtime/wisski_2x_3x.sh rename to internal/core/runtime/wisski_2x_3x.sh index dc97771..36c8f23 100644 --- a/core/runtime/wisski_2x_3x.sh +++ b/internal/core/runtime/wisski_2x_3x.sh @@ -7,7 +7,7 @@ chmod 666 web/sites/default/*settings.php chmod 666 web/sites/default/*services.yml # update the core itself -composer require 'drupal/core-recommended:^9' 'drupal/core-composer-scaffold:^9' 'drupal/core-project-message:^9' --update-with-dependencies --no-update +composer require 'drupal/internal/core-recommended:^9' 'drupal/internal/core-composer-scaffold:^9' 'drupal/internal/core-project-message:^9' --update-with-dependencies --no-update composer update composer require 'drupal/wisski' diff --git a/internal/docs.go b/internal/docs.go deleted file mode 100644 index 4846f24..0000000 --- a/internal/docs.go +++ /dev/null @@ -1,3 +0,0 @@ -// Package internal contains various utility functions. -// These do not directly involve the distillery. -package internal diff --git a/env/backup.go b/internal/env/backup.go similarity index 97% rename from env/backup.go rename to internal/env/backup.go index a75df8c..3aca5ac 100644 --- a/env/backup.go +++ b/internal/env/backup.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" - "github.com/FAU-CDI/wisski-distillery/internal/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/pkg/errors" "github.com/tkw1536/goprogram/stream" ) diff --git a/env/component.go b/internal/env/component.go similarity index 86% rename from env/component.go rename to internal/env/component.go index f834c9c..b909e3f 100644 --- a/env/component.go +++ b/internal/env/component.go @@ -6,14 +6,14 @@ import ( "sync" "time" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/component/dis" - "github.com/FAU-CDI/wisski-distillery/component/resolver" - "github.com/FAU-CDI/wisski-distillery/component/self" - "github.com/FAU-CDI/wisski-distillery/component/sql" - "github.com/FAU-CDI/wisski-distillery/component/ssh" - "github.com/FAU-CDI/wisski-distillery/component/triplestore" - "github.com/FAU-CDI/wisski-distillery/component/web" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/component/dis" + "github.com/FAU-CDI/wisski-distillery/internal/component/resolver" + "github.com/FAU-CDI/wisski-distillery/internal/component/self" + "github.com/FAU-CDI/wisski-distillery/internal/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/component/ssh" + "github.com/FAU-CDI/wisski-distillery/internal/component/triplestore" + "github.com/FAU-CDI/wisski-distillery/internal/component/web" ) // components holds the various components of the distillery diff --git a/env/distillery.go b/internal/env/distillery.go similarity index 94% rename from env/distillery.go rename to internal/env/distillery.go index c7d039b..b71dae3 100644 --- a/env/distillery.go +++ b/internal/env/distillery.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/config" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" ) // Distillery represents an interface to the running distillery. diff --git a/env/init.go b/internal/env/init.go similarity index 96% rename from env/init.go rename to internal/env/init.go index f87689b..aed58a7 100644 --- a/env/init.go +++ b/internal/env/init.go @@ -3,8 +3,8 @@ package env import ( "os" - "github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/config" + "github.com/FAU-CDI/wisski-distillery/internal/core" "github.com/tkw1536/goprogram/exit" ) diff --git a/env/instances.go b/internal/env/instances.go similarity index 98% rename from env/instances.go rename to internal/env/instances.go index e6d8442..9abe2d1 100644 --- a/env/instances.go +++ b/internal/env/instances.go @@ -12,9 +12,9 @@ import ( "path/filepath" "strings" - "github.com/FAU-CDI/wisski-distillery/component" - "github.com/FAU-CDI/wisski-distillery/internal/bookkeeping" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" + "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/pkg/bookkeeping" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/alessio/shellescape" "github.com/pkg/errors" "github.com/tkw1536/goprogram/exit" diff --git a/env/instances/barrel.env b/internal/env/instances/barrel.env similarity index 100% rename from env/instances/barrel.env rename to internal/env/instances/barrel.env diff --git a/env/instances/barrel/.dockerignore b/internal/env/instances/barrel/.dockerignore similarity index 100% rename from env/instances/barrel/.dockerignore rename to internal/env/instances/barrel/.dockerignore diff --git a/env/instances/barrel/.env.sample b/internal/env/instances/barrel/.env.sample similarity index 100% rename from env/instances/barrel/.env.sample rename to internal/env/instances/barrel/.env.sample diff --git a/env/instances/barrel/Dockerfile b/internal/env/instances/barrel/Dockerfile similarity index 100% rename from env/instances/barrel/Dockerfile rename to internal/env/instances/barrel/Dockerfile diff --git a/env/instances/barrel/conf/ports.conf b/internal/env/instances/barrel/conf/ports.conf similarity index 100% rename from env/instances/barrel/conf/ports.conf rename to internal/env/instances/barrel/conf/ports.conf diff --git a/env/instances/barrel/conf/wisski.conf b/internal/env/instances/barrel/conf/wisski.conf similarity index 100% rename from env/instances/barrel/conf/wisski.conf rename to internal/env/instances/barrel/conf/wisski.conf diff --git a/env/instances/barrel/conf/wisski.ini b/internal/env/instances/barrel/conf/wisski.ini similarity index 100% rename from env/instances/barrel/conf/wisski.ini rename to internal/env/instances/barrel/conf/wisski.ini diff --git a/env/instances/barrel/docker-compose.yml b/internal/env/instances/barrel/docker-compose.yml similarity index 100% rename from env/instances/barrel/docker-compose.yml rename to internal/env/instances/barrel/docker-compose.yml diff --git a/env/instances/barrel/patch/easyrdf.patch b/internal/env/instances/barrel/patch/easyrdf.patch similarity index 100% rename from env/instances/barrel/patch/easyrdf.patch rename to internal/env/instances/barrel/patch/easyrdf.patch diff --git a/env/instances/barrel/patch/triples.patch b/internal/env/instances/barrel/patch/triples.patch similarity index 100% rename from env/instances/barrel/patch/triples.patch rename to internal/env/instances/barrel/patch/triples.patch diff --git a/env/instances/barrel/scripts/entrypoint.sh b/internal/env/instances/barrel/scripts/entrypoint.sh similarity index 100% rename from env/instances/barrel/scripts/entrypoint.sh rename to internal/env/instances/barrel/scripts/entrypoint.sh diff --git a/env/instances/barrel/scripts/provision_container.sh b/internal/env/instances/barrel/scripts/provision_container.sh similarity index 100% rename from env/instances/barrel/scripts/provision_container.sh rename to internal/env/instances/barrel/scripts/provision_container.sh diff --git a/env/instances/barrel/scripts/user_shell.sh b/internal/env/instances/barrel/scripts/user_shell.sh similarity index 100% rename from env/instances/barrel/scripts/user_shell.sh rename to internal/env/instances/barrel/scripts/user_shell.sh diff --git a/env/instances/barrel/wisskiutils/create_adapter.php b/internal/env/instances/barrel/wisskiutils/create_adapter.php similarity index 100% rename from env/instances/barrel/wisskiutils/create_adapter.php rename to internal/env/instances/barrel/wisskiutils/create_adapter.php diff --git a/env/instances/barrel/wisskiutils/export_pathbuilder.php b/internal/env/instances/barrel/wisskiutils/export_pathbuilder.php similarity index 100% rename from env/instances/barrel/wisskiutils/export_pathbuilder.php rename to internal/env/instances/barrel/wisskiutils/export_pathbuilder.php diff --git a/env/instances/barrel/wisskiutils/list_uri_prefixes.php b/internal/env/instances/barrel/wisskiutils/list_uri_prefixes.php similarity index 100% rename from env/instances/barrel/wisskiutils/list_uri_prefixes.php rename to internal/env/instances/barrel/wisskiutils/list_uri_prefixes.php diff --git a/env/instances/barrel/wisskiutils/set_trusted_host.sh b/internal/env/instances/barrel/wisskiutils/set_trusted_host.sh similarity index 100% rename from env/instances/barrel/wisskiutils/set_trusted_host.sh rename to internal/env/instances/barrel/wisskiutils/set_trusted_host.sh diff --git a/env/instances/barrel/wisskiutils/settings_php_get.sh b/internal/env/instances/barrel/wisskiutils/settings_php_get.sh similarity index 100% rename from env/instances/barrel/wisskiutils/settings_php_get.sh rename to internal/env/instances/barrel/wisskiutils/settings_php_get.sh diff --git a/env/instances/barrel/wisskiutils/settings_php_set.sh b/internal/env/instances/barrel/wisskiutils/settings_php_set.sh similarity index 95% rename from env/instances/barrel/wisskiutils/settings_php_set.sh rename to internal/env/instances/barrel/wisskiutils/settings_php_set.sh index 785e23d..255faf1 100755 --- a/env/instances/barrel/wisskiutils/settings_php_set.sh +++ b/internal/env/instances/barrel/wisskiutils/settings_php_set.sh @@ -21,7 +21,7 @@ cd /var/www/data/project chmod u+w web/sites/default/settings.php (echo "$NAME"; echo "$VALUE" ) | drush php:eval ' - include_once DRUPAL_ROOT . "/core/includes/install.inc"; + include_once DRUPAL_ROOT . "/internal/core/includes/install.inc"; // read NAME and VALUE from STDIN $content=file_get_contents("php://stdin"); diff --git a/env/instances/reserve.env b/internal/env/instances/reserve.env similarity index 100% rename from env/instances/reserve.env rename to internal/env/instances/reserve.env diff --git a/env/instances/reserve/docker-compose.yml b/internal/env/instances/reserve/docker-compose.yml similarity index 100% rename from env/instances/reserve/docker-compose.yml rename to internal/env/instances/reserve/docker-compose.yml diff --git a/env/instances/reserve/index.html b/internal/env/instances/reserve/index.html similarity index 100% rename from env/instances/reserve/index.html rename to internal/env/instances/reserve/index.html diff --git a/env/instances_provision.go b/internal/env/instances_provision.go similarity index 97% rename from env/instances_provision.go rename to internal/env/instances_provision.go index e5a2833..42ddfae 100644 --- a/env/instances_provision.go +++ b/internal/env/instances_provision.go @@ -3,8 +3,8 @@ package env import ( "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/bookkeeping" "github.com/FAU-CDI/wisski-distillery/internal/config" + "github.com/FAU-CDI/wisski-distillery/pkg/bookkeeping" "github.com/pkg/errors" ) diff --git a/env/runtime.go b/internal/env/runtime.go similarity index 100% rename from env/runtime.go rename to internal/env/runtime.go diff --git a/env/server.go b/internal/env/server.go similarity index 100% rename from env/server.go rename to internal/env/server.go diff --git a/env/snapshot.go b/internal/env/snapshot.go similarity index 96% rename from env/snapshot.go rename to internal/env/snapshot.go index 40c66d7..eeb0bb7 100644 --- a/env/snapshot.go +++ b/internal/env/snapshot.go @@ -8,10 +8,10 @@ import ( "sync" "time" - "github.com/FAU-CDI/wisski-distillery/internal/bookkeeping" - "github.com/FAU-CDI/wisski-distillery/internal/fsx" - "github.com/FAU-CDI/wisski-distillery/internal/logging" - "github.com/FAU-CDI/wisski-distillery/internal/password" + "github.com/FAU-CDI/wisski-distillery/pkg/bookkeeping" + "github.com/FAU-CDI/wisski-distillery/pkg/fsx" + "github.com/FAU-CDI/wisski-distillery/pkg/logging" + "github.com/FAU-CDI/wisski-distillery/pkg/password" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/bookkeeping/bookkeeping.go b/pkg/bookkeeping/bookkeeping.go similarity index 100% rename from internal/bookkeeping/bookkeeping.go rename to pkg/bookkeeping/bookkeeping.go diff --git a/internal/execx/exec.go b/pkg/execx/exec.go similarity index 100% rename from internal/execx/exec.go rename to pkg/execx/exec.go diff --git a/internal/execx/look.go b/pkg/execx/look.go similarity index 100% rename from internal/execx/look.go rename to pkg/execx/look.go diff --git a/internal/fsx/copy.go b/pkg/fsx/copy.go similarity index 100% rename from internal/fsx/copy.go rename to pkg/fsx/copy.go diff --git a/internal/fsx/same.go b/pkg/fsx/same.go similarity index 100% rename from internal/fsx/same.go rename to pkg/fsx/same.go diff --git a/internal/fsx/touch.go b/pkg/fsx/touch.go similarity index 100% rename from internal/fsx/touch.go rename to pkg/fsx/touch.go diff --git a/internal/fsx/type.go b/pkg/fsx/type.go similarity index 100% rename from internal/fsx/type.go rename to pkg/fsx/type.go diff --git a/internal/hostname/hostname.go b/pkg/hostname/hostname.go similarity index 100% rename from internal/hostname/hostname.go rename to pkg/hostname/hostname.go diff --git a/internal/logging/level.go b/pkg/logging/level.go similarity index 100% rename from internal/logging/level.go rename to pkg/logging/level.go diff --git a/internal/logging/log.go b/pkg/logging/log.go similarity index 100% rename from internal/logging/log.go rename to pkg/logging/log.go diff --git a/internal/password/password.go b/pkg/password/password.go similarity index 100% rename from internal/password/password.go rename to pkg/password/password.go diff --git a/internal/sqle/name.go b/pkg/sqle/name.go similarity index 100% rename from internal/sqle/name.go rename to pkg/sqle/name.go diff --git a/internal/sqle/sqle.go b/pkg/sqle/sqle.go similarity index 100% rename from internal/sqle/sqle.go rename to pkg/sqle/sqle.go diff --git a/internal/targz/targz.go b/pkg/targz/targz.go similarity index 100% rename from internal/targz/targz.go rename to pkg/targz/targz.go diff --git a/internal/unpack/resource.go b/pkg/unpack/resource.go similarity index 100% rename from internal/unpack/resource.go rename to pkg/unpack/resource.go diff --git a/internal/unpack/template.go b/pkg/unpack/template.go similarity index 100% rename from internal/unpack/template.go rename to pkg/unpack/template.go diff --git a/internal/wait/wait.go b/pkg/wait/wait.go similarity index 100% rename from internal/wait/wait.go rename to pkg/wait/wait.go diff --git a/program.go b/program.go index 87b048e..1fd2f7f 100644 --- a/program.go +++ b/program.go @@ -3,8 +3,8 @@ package wisski_distillery import ( "os/user" - "github.com/FAU-CDI/wisski-distillery/core" - "github.com/FAU-CDI/wisski-distillery/env" + "github.com/FAU-CDI/wisski-distillery/internal/core" + "github.com/FAU-CDI/wisski-distillery/internal/env" "github.com/tkw1536/goprogram" "github.com/tkw1536/goprogram/exit" )