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

Move app config to app-config.json

Browse Source
This commit is contained in:
Chen-I Lim
2021-01-20 14:09:41 -08:00
parent 33d5dda7e3
commit d5d59ed71f
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -47,6 +47,8 @@ octo*.db
.eslintcache .eslintcache
.vscode/settings.json .vscode/settings.json
.prettierrc.json .prettierrc.json
# config.json is copied from app-config.json in the Makefile
mac/resources/config.json
mac/temp mac/temp
mac/dist mac/dist
linux/bin linux/bin

11
Makefile
View File

@ -108,6 +108,7 @@ mac-app: server-mac webapp
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/octoserver mac/resources/bin/octoserver
cp -R 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
xcodebuild archive -workspace mac/Tasks.xcworkspace -scheme Tasks -archivePath mac/temp/tasks.xcarchive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" CODE_SIGNING_ALLOWED="NO" xcodebuild archive -workspace mac/Tasks.xcworkspace -scheme Tasks -archivePath mac/temp/tasks.xcarchive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" CODE_SIGNING_ALLOWED="NO"
@ -120,20 +121,18 @@ win-app: server-win webapp
cd win; make build cd win; make build
mkdir -p win/temp/bin mkdir -p win/temp/bin
cp -R bin/win/octoserver.exe win/temp/bin cp -R bin/win/octoserver.exe win/temp/bin
cp -R config.json win/temp cp -R app-config.json win/temp/config.json
mkdir -p win/temp/webapp cp -R webapp/pack win/temp/pack
cp -R webapp/pack win/temp/webapp/pack
mkdir -p win/dist mkdir -p win/dist
# cd win/temp; tar -acf ../dist/tasks-win.zip . # cd win/temp; tar -acf ../dist/tasks-win.zip .
cd win/temp; powershell "Compress-Archive * ../dist/tasks-win.zip" cd win/temp; powershell "Compress-Archive * ../dist/tasks-win.zip"
linux-app: server-linux webapp linux-app: server-linux webapp
rm -rf linux/temp rm -rf linux/temp
mkdir -p linux/temp/tasks-app/webapp
mkdir -p linux/dist mkdir -p linux/dist
cp -R bin/linux/octoserver linux/temp/tasks-app/ cp -R bin/linux/octoserver linux/temp/tasks-app/
cp -R config.json linux/temp/tasks-app/ cp -R app-config.json linux/temp/tasks-app/config.json
cp -R webapp/pack linux/temp/tasks-app/webapp/pack cp -R webapp/pack linux/temp/tasks-app/pack
cd linux; make build cd linux; make build
cp -R linux/bin/tasks-app linux/temp/tasks-app/ cp -R linux/bin/tasks-app linux/temp/tasks-app/
cd linux/temp; tar -zcf ../dist/tasks-linux.tar.gz tasks-app cd linux/temp; tar -zcf ../dist/tasks-linux.tar.gz tasks-app

1
mac/resources/config.json → app-config.json
View File

@ -3,7 +3,6 @@
"port": 8088, "port": 8088,
"dbtype": "sqlite3", "dbtype": "sqlite3",
"dbconfig": "./octo.db", "dbconfig": "./octo.db",
"postgres_dbconfig": "dbname=octo sslmode=disable",
"useSSL": false, "useSSL": false,
"webpath": "./pack", "webpath": "./pack",
"filespath": "./files", "filespath": "./files",

2
linux/main.go
View File

@ -29,7 +29,7 @@ func main() {
w.SetTitle("Octo Tasks") w.SetTitle("Octo Tasks")
w.SetSize(1024, 768, webview.HintNone) w.SetSize(1024, 768, webview.HintNone)
w.Navigate("http://localhost:8000") w.Navigate("http://localhost:8088")
w.Run() w.Run()
cancel() cancel()
} }

2
win/main.go
View File

@ -36,7 +36,7 @@ func main() {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
cmd := runOctoTasks(ctx) cmd := runOctoTasks(ctx)
ui, err := lorca.New("http://localhost:8000", "", 1024, 768) ui, err := lorca.New("http://localhost:8088", "", 1024, 768)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }