diff --git a/config/config.go b/config/config.go index 5793ddcba..8ed64f610 100644 --- a/config/config.go +++ b/config/config.go @@ -4,7 +4,7 @@ import ( "errors" "io/ioutil" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/utils" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) diff --git a/controllers/admin/changeStreamKey.go b/controllers/admin/changeStreamKey.go index 394998858..9af9da6ae 100644 --- a/controllers/admin/changeStreamKey.go +++ b/controllers/admin/changeStreamKey.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/controllers" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/controllers" log "github.com/sirupsen/logrus" ) diff --git a/controllers/admin/disconnect.go b/controllers/admin/disconnect.go index 08fbc4f30..7b1e162a3 100644 --- a/controllers/admin/disconnect.go +++ b/controllers/admin/disconnect.go @@ -3,10 +3,10 @@ package admin import ( "net/http" - "github.com/gabek/owncast/controllers" - "github.com/gabek/owncast/core" + "github.com/owncast/owncast/controllers" + "github.com/owncast/owncast/core" - "github.com/gabek/owncast/core/rtmp" + "github.com/owncast/owncast/core/rtmp" ) // DisconnectInboundConnection will force-disconnect an inbound stream diff --git a/controllers/admin/hardware.go b/controllers/admin/hardware.go index 267c48bc4..9f2995a73 100644 --- a/controllers/admin/hardware.go +++ b/controllers/admin/hardware.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/metrics" + "github.com/owncast/owncast/metrics" ) // GetHardwareStats will return hardware utilization over time diff --git a/controllers/admin/inboundBroadcasterDetails.go b/controllers/admin/inboundBroadcasterDetails.go index 7abfe0e5c..83581e19d 100644 --- a/controllers/admin/inboundBroadcasterDetails.go +++ b/controllers/admin/inboundBroadcasterDetails.go @@ -4,9 +4,9 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/controllers" - "github.com/gabek/owncast/core" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/controllers" + "github.com/owncast/owncast/core" + "github.com/owncast/owncast/models" ) // GetInboundBroadasterDetails gets the details of the inbound broadcaster diff --git a/controllers/admin/serverConfig.go b/controllers/admin/serverConfig.go index 39771314c..9c99aa9ea 100644 --- a/controllers/admin/serverConfig.go +++ b/controllers/admin/serverConfig.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/config" + "github.com/owncast/owncast/config" ) // GetServerConfig gets the config details of the server diff --git a/controllers/admin/viewers.go b/controllers/admin/viewers.go index fe88e59a5..77fa0ad67 100644 --- a/controllers/admin/viewers.go +++ b/controllers/admin/viewers.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/metrics" + "github.com/owncast/owncast/metrics" ) // GetViewersOverTime will return the number of viewers at points in time diff --git a/controllers/chat.go b/controllers/chat.go index 38b1fafdd..f581bd338 100644 --- a/controllers/chat.go +++ b/controllers/chat.go @@ -4,9 +4,9 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/core" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/router/middleware" + "github.com/owncast/owncast/core" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/router/middleware" ) //GetChatMessages gets all of the chat messages diff --git a/controllers/config.go b/controllers/config.go index 19685a2b2..114f253bf 100644 --- a/controllers/config.go +++ b/controllers/config.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/router/middleware" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/router/middleware" ) //GetWebConfig gets the status of the server diff --git a/controllers/controllers.go b/controllers/controllers.go index bd9c75634..747793b2f 100644 --- a/controllers/controllers.go +++ b/controllers/controllers.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/models" ) type j map[string]interface{} diff --git a/controllers/emoji.go b/controllers/emoji.go index 808787e1a..b87f59780 100644 --- a/controllers/emoji.go +++ b/controllers/emoji.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" log "github.com/sirupsen/logrus" ) diff --git a/controllers/index.go b/controllers/index.go index f0a659f2a..18011fb40 100644 --- a/controllers/index.go +++ b/controllers/index.go @@ -11,10 +11,10 @@ import ( log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/core" - "github.com/gabek/owncast/router/middleware" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/core" + "github.com/owncast/owncast/router/middleware" + "github.com/owncast/owncast/utils" ) type MetadataPage struct { diff --git a/controllers/status.go b/controllers/status.go index 78e62f1dc..14aa88624 100644 --- a/controllers/status.go +++ b/controllers/status.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/core" - "github.com/gabek/owncast/router/middleware" + "github.com/owncast/owncast/core" + "github.com/owncast/owncast/router/middleware" ) //GetStatus gets the status of the server diff --git a/core/chat/chat.go b/core/chat/chat.go index 69ddb6c4d..4f5698504 100644 --- a/core/chat/chat.go +++ b/core/chat/chat.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/models" ) //Setup sets up the chat server diff --git a/core/chat/client.go b/core/chat/client.go index de37c4a58..74868e6ce 100644 --- a/core/chat/client.go +++ b/core/chat/client.go @@ -9,8 +9,8 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/net/websocket" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" "github.com/teris-io/shortid" ) diff --git a/core/chat/persistence.go b/core/chat/persistence.go index 9795eaf27..317ef4664 100644 --- a/core/chat/persistence.go +++ b/core/chat/persistence.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" _ "github.com/mattn/go-sqlite3" log "github.com/sirupsen/logrus" ) diff --git a/core/chat/server.go b/core/chat/server.go index 1ff81c39a..ca50455ae 100644 --- a/core/chat/server.go +++ b/core/chat/server.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/net/websocket" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" ) var ( diff --git a/core/chatListener.go b/core/chatListener.go index e9328c932..7857315fe 100644 --- a/core/chatListener.go +++ b/core/chatListener.go @@ -3,8 +3,8 @@ package core import ( "errors" - "github.com/gabek/owncast/core/chat" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/core/chat" + "github.com/owncast/owncast/models" ) //ChatListenerImpl the implementation of the chat client diff --git a/core/core.go b/core/core.go index 5b173b89b..918842c5d 100644 --- a/core/core.go +++ b/core/core.go @@ -9,12 +9,12 @@ import ( log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/core/chat" - "github.com/gabek/owncast/core/ffmpeg" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" - "github.com/gabek/owncast/yp" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/core/chat" + "github.com/owncast/owncast/core/ffmpeg" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" + "github.com/owncast/owncast/yp" ) var ( diff --git a/core/ffmpeg/ffmpeg.go b/core/ffmpeg/ffmpeg.go index 21dc8010b..5671ec6cb 100644 --- a/core/ffmpeg/ffmpeg.go +++ b/core/ffmpeg/ffmpeg.go @@ -1,7 +1,7 @@ package ffmpeg import ( - "github.com/gabek/owncast/config" + "github.com/owncast/owncast/config" ) //ShowStreamOfflineState generates and shows the stream's offline state diff --git a/core/ffmpeg/thumbnailGenerator.go b/core/ffmpeg/thumbnailGenerator.go index 121c53900..b98c7f41b 100644 --- a/core/ffmpeg/thumbnailGenerator.go +++ b/core/ffmpeg/thumbnailGenerator.go @@ -10,7 +10,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" + "github.com/owncast/owncast/config" ) //StartThumbnailGenerator starts generating thumbnails diff --git a/core/ffmpeg/transcoder.go b/core/ffmpeg/transcoder.go index 6eb874623..98f724887 100644 --- a/core/ffmpeg/transcoder.go +++ b/core/ffmpeg/transcoder.go @@ -10,8 +10,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/teris-io/shortid" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/utils" ) var _commandExec *exec.Cmd diff --git a/core/playlist/monitor.go b/core/playlist/monitor.go index 78f986f25..264edc1c3 100644 --- a/core/playlist/monitor.go +++ b/core/playlist/monitor.go @@ -12,9 +12,9 @@ import ( "github.com/radovskyb/watcher" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" ) var ( diff --git a/core/rtmp/rtmp.go b/core/rtmp/rtmp.go index 53703b8a6..3e8303914 100644 --- a/core/rtmp/rtmp.go +++ b/core/rtmp/rtmp.go @@ -14,11 +14,11 @@ import ( "github.com/nareix/joy5/format/flv/flvio" log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/core" - "github.com/gabek/owncast/core/ffmpeg" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/core" + "github.com/owncast/owncast/core/ffmpeg" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" "github.com/nareix/joy5/format/rtmp" ) diff --git a/core/rtmp/utils.go b/core/rtmp/utils.go index 00580c01f..a3344bc3c 100644 --- a/core/rtmp/utils.go +++ b/core/rtmp/utils.go @@ -6,7 +6,7 @@ import ( "fmt" "regexp" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/models" "github.com/nareix/joy5/format/flv/flvio" ) diff --git a/core/stats.go b/core/stats.go index 388d2f049..d4cc60dba 100644 --- a/core/stats.go +++ b/core/stats.go @@ -10,9 +10,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" ) const ( diff --git a/core/status.go b/core/status.go index 758ff4619..986ad61b9 100644 --- a/core/status.go +++ b/core/status.go @@ -3,10 +3,10 @@ package core import ( "time" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/core/ffmpeg" - "github.com/gabek/owncast/models" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/core/ffmpeg" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/utils" ) //GetStatus gets the status of the system diff --git a/core/storage.go b/core/storage.go index 57c6dee5c..8b94afa73 100644 --- a/core/storage.go +++ b/core/storage.go @@ -1,9 +1,9 @@ package core import ( - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/core/playlist" - "github.com/gabek/owncast/core/storageproviders" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/core/playlist" + "github.com/owncast/owncast/core/storageproviders" ) var ( diff --git a/core/storageproviders/s3Storage.go b/core/storageproviders/s3Storage.go index d437db45a..92a33876c 100644 --- a/core/storageproviders/s3Storage.go +++ b/core/storageproviders/s3Storage.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3/s3manager" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" ) //S3Storage is the s3 implementation of the ChunkStorageProvider diff --git a/go.mod b/go.mod index b10a47304..4655a9e4c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gabek/owncast +module github.com/owncast/owncast go 1.14 diff --git a/main.go b/main.go index f4db04942..2053e036a 100644 --- a/main.go +++ b/main.go @@ -7,10 +7,10 @@ import ( "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/core" - "github.com/gabek/owncast/metrics" - "github.com/gabek/owncast/router" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/core" + "github.com/owncast/owncast/metrics" + "github.com/owncast/owncast/router" ) // the following are injected at build-time diff --git a/metrics/viewers.go b/metrics/viewers.go index 6acc0abc5..0d03da257 100644 --- a/metrics/viewers.go +++ b/metrics/viewers.go @@ -3,7 +3,7 @@ package metrics import ( "time" - "github.com/gabek/owncast/core" + "github.com/owncast/owncast/core" ) // How often we poll for updates diff --git a/models/stats.go b/models/stats.go index da6723e66..bd543ac33 100644 --- a/models/stats.go +++ b/models/stats.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/utils" ) //Stats holds the stats for the system diff --git a/models/status.go b/models/status.go index 053f337be..47f6f77f2 100644 --- a/models/status.go +++ b/models/status.go @@ -1,6 +1,6 @@ package models -import "github.com/gabek/owncast/utils" +import "github.com/owncast/owncast/utils" //Status represents the status of the system type Status struct { diff --git a/router/middleware/auth.go b/router/middleware/auth.go index 13974ab1f..a3298a0b6 100644 --- a/router/middleware/auth.go +++ b/router/middleware/auth.go @@ -4,7 +4,7 @@ import ( "crypto/subtle" "net/http" - "github.com/gabek/owncast/config" + "github.com/owncast/owncast/config" log "github.com/sirupsen/logrus" ) diff --git a/router/router.go b/router/router.go index 64ad1016f..0b3b56b0e 100644 --- a/router/router.go +++ b/router/router.go @@ -6,14 +6,14 @@ import ( log "github.com/sirupsen/logrus" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/controllers" - "github.com/gabek/owncast/controllers/admin" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/controllers" + "github.com/owncast/owncast/controllers/admin" - "github.com/gabek/owncast/core/chat" - "github.com/gabek/owncast/core/rtmp" - "github.com/gabek/owncast/router/middleware" - "github.com/gabek/owncast/yp" + "github.com/owncast/owncast/core/chat" + "github.com/owncast/owncast/core/rtmp" + "github.com/owncast/owncast/router/middleware" + "github.com/owncast/owncast/yp" ) //Start starts the router for the http, ws, and rtmp diff --git a/scripts/build.sh b/scripts/build.sh index a0738d6b0..51ccd280b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -52,7 +52,7 @@ build() { pushd dist/${NAME} >> /dev/null - CGO_ENABLED=1 ~/go/bin/xgo --branch ${GIT_BRANCH} -ldflags "-s -w -X main.GitCommit=${GIT_COMMIT} -X main.BuildVersion=${VERSION} -X main.BuildType=${NAME}" -targets "${OS}/${ARCH}" github.com/gabek/owncast + CGO_ENABLED=1 ~/go/bin/xgo --branch ${GIT_BRANCH} -ldflags "-s -w -X main.GitCommit=${GIT_COMMIT} -X main.BuildVersion=${VERSION} -X main.BuildType=${NAME}" -targets "${OS}/${ARCH}" github.com/owncast/owncast mv owncast-*-${ARCH} owncast zip -r -q -8 ../owncast-$NAME-$VERSION.zip . @@ -76,7 +76,7 @@ git tag -a "v${VERSION}" -m "Release build v${VERSION}" # On macOS open the Github page for new releases so they can be uploaded if test -f "/usr/bin/open"; then - open "https://github.com/gabek/owncast/releases/new" + open "https://github.com/owncast/owncast/releases/new" open dist fi @@ -90,8 +90,8 @@ cd $(git rev-parse --show-toplevel) # Github Packages docker build --build-arg NAME=docker --build-arg VERSION=${VERSION} --build-arg GIT_COMMIT=$GIT_COMMIT -t owncast . -f scripts/Dockerfile-build -docker tag $DOCKER_IMAGE docker.pkg.github.com/gabek/owncast/$DOCKER_IMAGE:$VERSION -docker push docker.pkg.github.com/gabek/owncast/$DOCKER_IMAGE:$VERSION +docker tag $DOCKER_IMAGE docker.pkg.github.com/owncast/owncast/$DOCKER_IMAGE:$VERSION +docker push docker.pkg.github.com/owncast/owncast/$DOCKER_IMAGE:$VERSION # # Dockerhub # You must be authenticated via `docker login` with your Dockerhub credentials first. diff --git a/yp/api.go b/yp/api.go index 57af412a8..5b8382e5e 100644 --- a/yp/api.go +++ b/yp/api.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/utils" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/utils" ) type ypDetailsResponse struct { diff --git a/yp/yp.go b/yp/yp.go index 9dd5b1f02..2a616dca3 100644 --- a/yp/yp.go +++ b/yp/yp.go @@ -9,8 +9,8 @@ import ( "encoding/json" - "github.com/gabek/owncast/config" - "github.com/gabek/owncast/models" + "github.com/owncast/owncast/config" + "github.com/owncast/owncast/models" log "github.com/sirupsen/logrus" )