rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor Package structure

Browse source 
This commit cleans up the package structure, to make two new top-level
packages `internal` (for internal-use packages) and `pkg` (for general
shared utility code).
This commit is contained in:
Tom Wiesing 2022-09-12 14:46:18 +02:00
parent 487ce09979
commit a360324f62
No known key found for this signature in database
124 changed files with 97 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/backup.go
View file

@ -5,10 +5,10 @@ import (
"os" "os"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/env" "github.com/FAU-CDI/wisski-distillery/internal/env"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/FAU-CDI/wisski-distillery/internal/targz" "github.com/FAU-CDI/wisski-distillery/pkg/targz"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

4
cmd/blind_update.go
View file

@ -2,8 +2,8 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/execx" "github.com/FAU-CDI/wisski-distillery/pkg/execx"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

12
cmd/bootstrap.go
View file

@ -7,13 +7,13 @@ import (
"path/filepath" "path/filepath"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" wisski_distillery "github.com/FAU-CDI/wisski-distillery"
"github.com/FAU-CDI/wisski-distillery/core"
cfg "github.com/FAU-CDI/wisski-distillery/internal/config" cfg "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/internal/hostname" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/hostname"
"github.com/FAU-CDI/wisski-distillery/internal/password" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/FAU-CDI/wisski-distillery/internal/unpack" "github.com/FAU-CDI/wisski-distillery/pkg/password"
"github.com/FAU-CDI/wisski-distillery/pkg/unpack"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

2
cmd/config.go
View file

@ -2,7 +2,7 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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 // Config is the configuration command

4
cmd/cron.go
View file

@ -2,8 +2,8 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

2
cmd/info.go
View file

@ -2,7 +2,7 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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 // Info is then 'info' command

2
cmd/license.go
View file

@ -2,7 +2,7 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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" "github.com/FAU-CDI/wisski-distillery/internal/legal"
) )

2
cmd/ls.go
View file

@ -2,7 +2,7 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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 // Ls is the 'ls' command

4
cmd/make_mysql_account.go
View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/sqle" "github.com/FAU-CDI/wisski-distillery/pkg/sqle"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
"github.com/tkw1536/goprogram/parser" "github.com/tkw1536/goprogram/parser"
) )

4
cmd/monday.go
View file

@ -4,8 +4,8 @@ import (
"os" "os"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
) )
// Monday is the 'monday' command // Monday is the 'monday' command

2
cmd/mysql.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/exit"
"github.com/tkw1536/goprogram/parser" "github.com/tkw1536/goprogram/parser"
) )

6
cmd/provision.go
View file

@ -2,9 +2,9 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

6
cmd/purge.go
View file

@ -4,9 +4,9 @@ import (
"os" "os"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/env" "github.com/FAU-CDI/wisski-distillery/internal/env"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

6
cmd/rebuild.go
View file

@ -2,9 +2,9 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" wisski_distillery "github.com/FAU-CDI/wisski-distillery"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/core"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

8
cmd/reserve.go
View file

@ -2,10 +2,10 @@ package cmd
import ( import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" wisski_distillery "github.com/FAU-CDI/wisski-distillery"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/core"
"github.com/FAU-CDI/wisski-distillery/internal/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

2
cmd/servers.go
View file

@ -4,7 +4,7 @@ import (
"net/http" "net/http"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/exit"
) )

2
cmd/shell.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/exit"
"github.com/tkw1536/goprogram/parser" "github.com/tkw1536/goprogram/parser"
) )

8
cmd/snapshot.go
View file

@ -5,10 +5,10 @@ import (
"os" "os"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/env" "github.com/FAU-CDI/wisski-distillery/internal/env"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/FAU-CDI/wisski-distillery/internal/targz" "github.com/FAU-CDI/wisski-distillery/pkg/targz"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

10
cmd/system_update.go
View file

@ -4,11 +4,11 @@ import (
"os" "os"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" wisski_distillery "github.com/FAU-CDI/wisski-distillery"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/core"
"github.com/FAU-CDI/wisski-distillery/internal/execx" "github.com/FAU-CDI/wisski-distillery/pkg/execx"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/FAU-CDI/wisski-distillery/internal/unpack" "github.com/FAU-CDI/wisski-distillery/pkg/unpack"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
"github.com/tkw1536/goprogram/parser" "github.com/tkw1536/goprogram/parser"
) )

4
cmd/update_prefix_config.go
View file

@ -5,8 +5,8 @@ import (
"os" "os"
wisski_distillery "github.com/FAU-CDI/wisski-distillery" 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/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

2
cmd/wdcli/main.go
View file

@ -8,7 +8,7 @@ import (
wisski_distillery "github.com/FAU-CDI/wisski-distillery" wisski_distillery "github.com/FAU-CDI/wisski-distillery"
"github.com/FAU-CDI/wisski-distillery/cmd" "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/exit"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
) )

2
component/component.go → internal/component/component.go
View file

@ -23,7 +23,7 @@ type Component interface {
Name() string Name() string
// Path returns the path this component is installed at. // 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 Path() string
// Stack can be used to gain access to the "docker compose" stack. // Stack can be used to gain access to the "docker compose" stack.

0
component/dis/dis.env → internal/component/dis/dis.env
View file

4
component/dis/dis.go → internal/component/dis/dis.go
View file

@ -3,8 +3,8 @@ package dis
import ( import (
"embed" "embed"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/core"
) )
type Dis struct { type Dis struct {

0
component/dis/stack/Dockerfile → internal/component/dis/stack/Dockerfile
View file

0
component/dis/stack/docker-compose.yml → internal/component/dis/stack/docker-compose.yml
View file

4
component/installable.go → internal/component/installable.go
View file

@ -5,8 +5,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/FAU-CDI/wisski-distillery/internal/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/FAU-CDI/wisski-distillery/internal/unpack" "github.com/FAU-CDI/wisski-distillery/pkg/unpack"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
) )

0
component/resolver/resolver.env → internal/component/resolver/resolver.env
View file

4
component/resolver/resolver.go → internal/component/resolver/resolver.go
View file

@ -9,8 +9,8 @@ import (
"github.com/FAU-CDI/wdresolve" "github.com/FAU-CDI/wdresolve"
"github.com/FAU-CDI/wdresolve/resolvers" "github.com/FAU-CDI/wdresolve/resolvers"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/core" "github.com/FAU-CDI/wisski-distillery/internal/core"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
) )

0
component/resolver/stack/Dockerfile → internal/component/resolver/stack/Dockerfile
View file

0
component/resolver/stack/docker-compose.yml → internal/component/resolver/stack/docker-compose.yml
View file

0
component/self/self.env → internal/component/self/self.env
View file

2
component/self/self.go → internal/component/self/self.go
View file

@ -3,7 +3,7 @@ package self
import ( import (
"embed" "embed"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
) )
type Self struct { type Self struct {

0
component/self/stack/docker-compose.yml → internal/component/self/stack/docker-compose.yml
View file

8
component/sql/database.go → internal/component/sql/database.go
View file

@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/FAU-CDI/wisski-distillery/internal/bookkeeping" "github.com/FAU-CDI/wisski-distillery/pkg/bookkeeping"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/FAU-CDI/wisski-distillery/internal/sqle" "github.com/FAU-CDI/wisski-distillery/pkg/sqle"
"github.com/FAU-CDI/wisski-distillery/internal/wait" "github.com/FAU-CDI/wisski-distillery/pkg/wait"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"

2
component/sql/sql.go → internal/component/sql/sql.go
View file

@ -6,7 +6,7 @@ import (
"io/fs" "io/fs"
"time" "time"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
) )
type SQL struct { type SQL struct {

0
component/sql/stack/docker-compose.yml → internal/component/sql/stack/docker-compose.yml
View file

2
component/ssh/ssh.go → internal/component/ssh/ssh.go
View file

@ -3,7 +3,7 @@ package ssh
import ( import (
"embed" "embed"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
) )
type SSH struct { type SSH struct {

0
component/ssh/stack/docker-compose.yml → internal/component/ssh/stack/docker-compose.yml
View file

2
component/stack.go → internal/component/stack.go
View file

@ -4,7 +4,7 @@ package component
import ( import (
"errors" "errors"
"github.com/FAU-CDI/wisski-distillery/internal/execx" "github.com/FAU-CDI/wisski-distillery/pkg/execx"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
) )

0
component/triplestore/create-repo.ttl → internal/component/triplestore/create-repo.ttl
View file

4
component/triplestore/database.go → internal/component/triplestore/database.go
View file

@ -11,8 +11,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/FAU-CDI/wisski-distillery/internal/wait" "github.com/FAU-CDI/wisski-distillery/pkg/wait"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
) )

2
component/triplestore/provision.go → internal/component/triplestore/provision.go
View file

@ -6,7 +6,7 @@ import (
_ "embed" _ "embed"
"github.com/FAU-CDI/wisski-distillery/internal/unpack" "github.com/FAU-CDI/wisski-distillery/pkg/unpack"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

0
component/triplestore/stack/.dockerignore → internal/component/triplestore/stack/.dockerignore
View file

0
component/triplestore/stack/Dockerfile → internal/component/triplestore/stack/Dockerfile
View file

0
component/triplestore/stack/docker-compose.yml → internal/component/triplestore/stack/docker-compose.yml
View file

0
component/triplestore/stack/entrypoint.sh → internal/component/triplestore/stack/entrypoint.sh
View file

2
component/triplestore/triplestore.go → internal/component/triplestore/triplestore.go
View file

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
) )
type Triplestore struct { type Triplestore struct {

0
component/web/stack/docker-compose.yml → internal/component/web/stack/docker-compose.yml
View file

0
component/web/stack/global.conf → internal/component/web/stack/global.conf
View file

0
component/web/stack/proxy.conf → internal/component/web/stack/proxy.conf
View file

0
component/web/web.env → internal/component/web/web.env
View file

2
component/web/web.go → internal/component/web/web.go
View file

@ -3,7 +3,7 @@ package web
import ( import (
"embed" "embed"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
) )
// Web implements the web component // Web implements the web component

2
internal/config/password.go
View file

@ -1,6 +1,6 @@
package config 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 // NewPassword returns a new password using the password settings from this configuration
func (cfg Config) NewPassword() (string, error) { func (cfg Config) NewPassword() (string, error) {

2
internal/config/validators.go
View file

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/FAU-CDI/wisski-distillery/internal/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

0
core/bootstrap.go → internal/core/bootstrap.go
View file

0
core/bootstrap/env → internal/core/bootstrap/env
View file

0
core/bootstrap/global_authorized_keys → internal/core/bootstrap/global_authorized_keys
View file

0
core/bootstrap/overrides.json → internal/core/bootstrap/overrides.json
View file

0
core/core.go → internal/core/core.go
View file

0
core/flags.go → internal/core/flags.go
View file

0
core/meta.go → internal/core/meta.go
View file

0
core/params.go → internal/core/params.go
View file

0
core/requirements.go → internal/core/requirements.go
View file

1
core/runtime.go → internal/core/runtime.go
View file

@ -2,7 +2,6 @@ package core
import ( import (
"embed" "embed"
_ "embed"
) )
// Runtime contains runtime resources to be installed into any instance // Runtime contains runtime resources to be installed into any instance

0
core/runtime/README → internal/core/runtime/README
View file

0
core/runtime/blind_update.sh → internal/core/runtime/blind_update.sh
View file

0
core/runtime/create_admin.sh → internal/core/runtime/create_admin.sh
View file

0
core/runtime/cron.sh → internal/core/runtime/cron.sh
View file

0
core/runtime/install_colorbox.sh → internal/core/runtime/install_colorbox.sh
View file

0
core/runtime/patch_easyrdf.sh → internal/core/runtime/patch_easyrdf.sh
View file

0
core/runtime/patch_triples.sh → internal/core/runtime/patch_triples.sh
View file

0
core/runtime/use_wisski.sh → internal/core/runtime/use_wisski.sh
View file

2
core/runtime/wisski_2x_3x.sh → internal/core/runtime/wisski_2x_3x.sh
View file

@ -7,7 +7,7 @@ chmod 666 web/sites/default/*settings.php
chmod 666 web/sites/default/*services.yml chmod 666 web/sites/default/*services.yml
# update the core itself # 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 update
composer require 'drupal/wisski' composer require 'drupal/wisski'

3
internal/docs.go
View file

@ -1,3 +0,0 @@
// Package internal contains various utility functions.
// These do not directly involve the distillery.
package internal

4
env/backup.go → internal/env/backup.go vendored
View file

@ -8,8 +8,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/FAU-CDI/wisski-distillery/internal/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/FAU-CDI/wisski-distillery/internal/logging" "github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tkw1536/goprogram/stream" "github.com/tkw1536/goprogram/stream"
) )

16
env/component.go → internal/env/component.go vendored
View file

@ -6,14 +6,14 @@ import (
"sync" "sync"
"time" "time"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/component/dis" "github.com/FAU-CDI/wisski-distillery/internal/component/dis"
"github.com/FAU-CDI/wisski-distillery/component/resolver" "github.com/FAU-CDI/wisski-distillery/internal/component/resolver"
"github.com/FAU-CDI/wisski-distillery/component/self" "github.com/FAU-CDI/wisski-distillery/internal/component/self"
"github.com/FAU-CDI/wisski-distillery/component/sql" "github.com/FAU-CDI/wisski-distillery/internal/component/sql"
"github.com/FAU-CDI/wisski-distillery/component/ssh" "github.com/FAU-CDI/wisski-distillery/internal/component/ssh"
"github.com/FAU-CDI/wisski-distillery/component/triplestore" "github.com/FAU-CDI/wisski-distillery/internal/component/triplestore"
"github.com/FAU-CDI/wisski-distillery/component/web" "github.com/FAU-CDI/wisski-distillery/internal/component/web"
) )
// components holds the various components of the distillery // components holds the various components of the distillery

4
env/distillery.go → internal/env/distillery.go vendored
View file

@ -5,9 +5,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/FAU-CDI/wisski-distillery/core"
"github.com/FAU-CDI/wisski-distillery/internal/config" "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. // Distillery represents an interface to the running distillery.

2
env/init.go → internal/env/init.go vendored
View file

@ -3,8 +3,8 @@ package env
import ( import (
"os" "os"
"github.com/FAU-CDI/wisski-distillery/core"
"github.com/FAU-CDI/wisski-distillery/internal/config" "github.com/FAU-CDI/wisski-distillery/internal/config"
"github.com/FAU-CDI/wisski-distillery/internal/core"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"
) )

6
env/instances.go → internal/env/instances.go vendored
View file

@ -12,9 +12,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/FAU-CDI/wisski-distillery/component" "github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/internal/bookkeeping" "github.com/FAU-CDI/wisski-distillery/pkg/bookkeeping"
"github.com/FAU-CDI/wisski-distillery/internal/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/alessio/shellescape" "github.com/alessio/shellescape"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/exit"

0
env/instances/barrel.env → internal/env/instances/barrel.env vendored
View file

0
env/instances/barrel/.dockerignore → internal/env/instances/barrel/.dockerignore vendored
View file

0
env/instances/barrel/.env.sample → internal/env/instances/barrel/.env.sample vendored
View file

0
env/instances/barrel/Dockerfile → internal/env/instances/barrel/Dockerfile vendored
View file

0
env/instances/barrel/conf/ports.conf → internal/env/instances/barrel/conf/ports.conf vendored
View file

0
env/instances/barrel/conf/wisski.conf → internal/env/instances/barrel/conf/wisski.conf vendored
View file

0
env/instances/barrel/conf/wisski.ini → internal/env/instances/barrel/conf/wisski.ini vendored
View file

0
env/instances/barrel/docker-compose.yml → internal/env/instances/barrel/docker-compose.yml vendored
View file

0
env/instances/barrel/patch/easyrdf.patch → internal/env/instances/barrel/patch/easyrdf.patch vendored
View file

0
env/instances/barrel/patch/triples.patch → internal/env/instances/barrel/patch/triples.patch vendored
View file

0
env/instances/barrel/scripts/entrypoint.sh → internal/env/instances/barrel/scripts/entrypoint.sh vendored
View file

0
env/instances/barrel/scripts/provision_container.sh → internal/env/instances/barrel/scripts/provision_container.sh vendored
View file

0
env/instances/barrel/scripts/user_shell.sh → internal/env/instances/barrel/scripts/user_shell.sh vendored
View file

0
env/instances/barrel/wisskiutils/create_adapter.php → internal/env/instances/barrel/wisskiutils/create_adapter.php vendored
View file

0
env/instances/barrel/wisskiutils/export_pathbuilder.php → internal/env/instances/barrel/wisskiutils/export_pathbuilder.php vendored
View file

0
env/instances/barrel/wisskiutils/list_uri_prefixes.php → internal/env/instances/barrel/wisskiutils/list_uri_prefixes.php vendored
View file

0
env/instances/barrel/wisskiutils/set_trusted_host.sh → internal/env/instances/barrel/wisskiutils/set_trusted_host.sh vendored
View file

0
env/instances/barrel/wisskiutils/settings_php_get.sh → internal/env/instances/barrel/wisskiutils/settings_php_get.sh vendored
View file

2
env/instances/barrel/wisskiutils/settings_php_set.sh → internal/env/instances/barrel/wisskiutils/settings_php_set.sh vendored
View file

@ -21,7 +21,7 @@ cd /var/www/data/project
chmod u+w web/sites/default/settings.php chmod u+w web/sites/default/settings.php
(echo "$NAME"; echo "$VALUE" ) | drush php:eval ' (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 // read NAME and VALUE from STDIN
$content=file_get_contents("php://stdin"); $content=file_get_contents("php://stdin");

0
env/instances/reserve.env → internal/env/instances/reserve.env vendored
View file

Some files were not shown because too many files have changed in this diff Show more