self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2025-07-09 23:45:41 +02:00
Code Issues Releases Activity

Rename focalboard-server binary

Browse Source
This commit is contained in:
Chen-I Lim
2021-01-28 14:23:52 -08:00
parent f1d974f7b9
commit b72f5ced7d
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
run: make server-linux-package run: make server-linux-package
- name: Copy server binary for Cypress - name: Copy server binary for Cypress
run: cp bin/linux/octoserver bin/ run: cp bin/linux/focalboard-server bin/
- name: Upload server package - name: Upload server package
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1

26
Makefile
View File

@ -27,26 +27,26 @@ ci: server-test
server: server:
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=dev") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=dev")
cd server; go build -ldflags '$(LDFLAGS)' -o ../bin/octoserver ./main cd server; go build -ldflags '$(LDFLAGS)' -o ../bin/focalboard-server ./main
server-mac: server-mac:
mkdir -p bin/mac mkdir -p bin/mac
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=mac") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=mac")
cd server; env GOOS=darwin GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/mac/octoserver ./main cd server; env GOOS=darwin GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/mac/focalboard-server ./main
server-linux: server-linux:
mkdir -p bin/linux mkdir -p bin/linux
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=linux") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=linux")
cd server; env GOOS=linux GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/linux/octoserver ./main cd server; env GOOS=linux GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/linux/focalboard-server ./main
server-win: server-win:
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=win") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=win")
cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/win/octoserver.exe ./main cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/win/focalboard-server.exe ./main
server-linux-package: server-linux webapp server-linux-package: server-linux webapp
rm -rf package rm -rf package
mkdir -p package/${PACKAGE_FOLDER}/bin mkdir -p package/${PACKAGE_FOLDER}/bin
cp bin/linux/octoserver package/${PACKAGE_FOLDER}/bin cp bin/linux/focalboard-server package/${PACKAGE_FOLDER}/bin
cp -R webapp/pack package/${PACKAGE_FOLDER}/pack cp -R webapp/pack package/${PACKAGE_FOLDER}/pack
cp server-config.json package/${PACKAGE_FOLDER}/config.json cp server-config.json package/${PACKAGE_FOLDER}/config.json
cp build/MIT-COMPILED-LICENSE.md package/${PACKAGE_FOLDER} cp build/MIT-COMPILED-LICENSE.md package/${PACKAGE_FOLDER}
@ -58,21 +58,21 @@ server-linux-package: server-linux webapp
server-single-user: server-single-user:
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=dev") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=dev")
cd server; go build -ldflags '$(LDFLAGS)' -o ../bin/octoserver ./main --single-user cd server; go build -ldflags '$(LDFLAGS)' -o ../bin/focalboard-server ./main --single-user
server-mac-single-user: server-mac-single-user:
mkdir -p bin/mac mkdir -p bin/mac
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=mac") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=mac")
cd server; env GOOS=darwin GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/mac/octoserver ./main --single-user cd server; env GOOS=darwin GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/mac/focalboard-server ./main --single-user
server-linux-single-user: server-linux-single-user:
mkdir -p bin/linux mkdir -p bin/linux
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=linux") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=linux")
cd server; env GOOS=linux GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/linux/octoserver ./main --single-user cd server; env GOOS=linux GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/linux/focalboard-server ./main --single-user
server-win-single-user: server-win-single-user:
$(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=win") $(eval LDFLAGS += -X "github.com/mattermost/focalboard/server/model.Edition=win")
cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/octoserver.exe ./main --single-user cd server; env GOOS=windows GOARCH=amd64 go build -ldflags '$(LDFLAGS)' -o ../bin/focalboard-server.exe ./main --single-user
generate: generate:
cd server; go get -modfile=go.tools.mod github.com/golang/mock/mockgen cd server; go get -modfile=go.tools.mod github.com/golang/mock/mockgen
@ -96,7 +96,7 @@ watch-server:
cd server; modd cd server; modd
watch-server-single-user: watch-server-single-user:
cd server; env OCTOSERVER_ARGS=--single-user modd cd server; env FOCALBOARDSERVER_ARGS=--single-user modd
webapp: webapp:
cd webapp; npm run pack cd webapp; npm run pack
@ -107,7 +107,7 @@ mac-app: server-mac webapp
rm -rf mac/resources/bin rm -rf mac/resources/bin
rm -rf mac/resources/pack rm -rf mac/resources/pack
mkdir -p mac/resources/bin mkdir -p mac/resources/bin
cp bin/mac/octoserver mac/resources/bin/octoserver cp bin/mac/focalboard-server mac/resources/bin/focalboard-server
cp app-config.json mac/resources/config.json cp app-config.json mac/resources/config.json
cp -R webapp/pack mac/resources/pack cp -R webapp/pack mac/resources/pack
mkdir -p mac/temp mkdir -p mac/temp
@ -125,7 +125,7 @@ win-app: server-win webapp
rm -rf win/dist rm -rf win/dist
cd win; make build cd win; make build
mkdir -p win/temp mkdir -p win/temp
cp bin/win/octoserver.exe win/temp cp bin/win/focalboard-server.exe win/temp
cp app-config.json win/temp/config.json cp app-config.json win/temp/config.json
cp build/MIT-COMPILED-LICENSE.md win/temp cp build/MIT-COMPILED-LICENSE.md win/temp
cp NOTICE.txt win/temp cp NOTICE.txt win/temp
@ -140,7 +140,7 @@ linux-app: server-linux webapp
rm -rf linux/dist rm -rf linux/dist
mkdir -p linux/dist mkdir -p linux/dist
mkdir -p linux/temp/focalboard-app mkdir -p linux/temp/focalboard-app
cp bin/linux/octoserver linux/temp/focalboard-app/ cp bin/linux/focalboard-server linux/temp/focalboard-app/
cp app-config.json linux/temp/focalboard-app/config.json cp app-config.json linux/temp/focalboard-app/config.json
cp build/MIT-COMPILED-LICENSE.md linux/temp/focalboard-app/ cp build/MIT-COMPILED-LICENSE.md linux/temp/focalboard-app/
cp NOTICE.txt linux/temp/focalboard-app/ cp NOTICE.txt linux/temp/focalboard-app/

2
README.md
View File

@ -30,7 +30,7 @@ The server defaults to using SQLite as the store, but can be configured to use P
## Running and testing the server ## Running and testing the server
To start the server, run `./bin/octoserver` To start the server, run `./bin/focalboard-server`
Server settings are in config.json. Server settings are in config.json.

2
linux/main.go
View File

@ -11,7 +11,7 @@ import (
) )
func runServer(ctx context.Context) { func runServer(ctx context.Context) {
cmd := exec.CommandContext(ctx, "./octoserver", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10), "--single-user") cmd := exec.CommandContext(ctx, "./focalboard-server", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10), "--single-user")
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {

2
mac/Focalboard.xcodeproj/project.pbxproj
View File

@ -274,7 +274,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "# Comment out codesign for now\n# /usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.mattermost.octoserver\" --entitlement \"$PROJECT_DIR/Focalboard/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/octoserver\"\n"; shellScript = "# Comment out codesign for now\n# /usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.mattermost.FocalboardServer\" --entitlement \"$PROJECT_DIR/Focalboard/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/focalboard-server\"\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */

2
mac/Focalboard/AppDelegate.swift
View File

@ -70,7 +70,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
private func startServer() { private func startServer() {
let cwdUrl = webFolder() let cwdUrl = webFolder()
let executablePath = Bundle.main.path(forResource: "resources/bin/octoserver", ofType: "") let executablePath = Bundle.main.path(forResource: "resources/bin/focalboard-server", ofType: "")
let pid = ProcessInfo.processInfo.processIdentifier let pid = ProcessInfo.processInfo.processIdentifier
NSLog("pid: \(pid)") NSLog("pid: \(pid)")

4
server/modd.conf
View File

@ -1,4 +1,4 @@
**/*.go !**/*_test.go { **/*.go !**/*_test.go {
prep: go build -o ../bin/octoserver ./main prep: go build -o ../bin/focalboard-server ./main
daemon +sigterm: cd .. && ./bin/octoserver $OCTOSERVER_ARGS daemon +sigterm: cd .. && ./bin/focalboard-server $FOCALBOARDSERVER_ARGS
} }

2
webapp/package.json
View File

@ -11,7 +11,7 @@
"check": "eslint --ext .tsx,.ts . --quiet --cache", "check": "eslint --ext .tsx,.ts . --quiet --cache",
"fix": "eslint --ext .tsx,.ts . --quiet --fix --cache", "fix": "eslint --ext .tsx,.ts . --quiet --fix --cache",
"i18n-extract": "formatjs extract src/**/*.tsx src/**/*.ts --out-file i18n/tmp.json; formatjs compile i18n/tmp.json --out-file i18n/en.json; rm i18n/tmp.json", "i18n-extract": "formatjs extract src/**/*.tsx src/**/*.ts --out-file i18n/tmp.json; formatjs compile i18n/tmp.json --out-file i18n/en.json; rm i18n/tmp.json",
"runserver-test": "cd cypress && ../../bin/octoserver --single-user", "runserver-test": "cd cypress && ../../bin/focalboard-server --single-user",
"cypress:ci": "start-server-and-test runserver-test http://localhost:8088 cypress:run", "cypress:ci": "start-server-and-test runserver-test http://localhost:8088 cypress:run",
"cypress:run": "cypress run", "cypress:run": "cypress run",
"cypress:run:chrome": "cypress run --browser chrome", "cypress:run:chrome": "cypress run --browser chrome",

2
website/site/content/download/personal-edition/ubuntu.md
View File

@ -162,7 +162,7 @@ Description=Focalboard server
Type=simple Type=simple
Restart=always Restart=always
RestartSec=5s RestartSec=5s
ExecStart=/opt/focalboard/bin/octoserver ExecStart=/opt/focalboard/bin/focalboard-server
WorkingDirectory=/opt/focalboard WorkingDirectory=/opt/focalboard
[Install] [Install]

8
win/main.go
View File

@ -12,10 +12,10 @@ import (
) )
func runServer(ctx context.Context) *exec.Cmd { func runServer(ctx context.Context) *exec.Cmd {
// cmd := exec.CommandContext(ctx, "octoserver.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10), "--single-user") // cmd := exec.CommandContext(ctx, "focalboard-server.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10), "--single-user")
cmd := exec.CommandContext(ctx, "octoserver.exe", "--single-user") cmd := exec.CommandContext(ctx, "focalboard-server.exe", "--single-user")
// cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./bin/octoserver.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10)) // cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./bin/focalboard-server.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10))
// cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./bin/octoserver.exe") // cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./bin/focalboard-server.exe")
// cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} // cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout