From ae3a9b8051947686648c7825b8a79953ea3254c4 Mon Sep 17 00:00:00 2001 From: Takiguchi Date: Mon, 1 Oct 2018 21:07:34 +0200 Subject: [PATCH] Add configuration for production continuous integration and deployment --- src/main/bash/minecraft-server/minecraft-server.sh | 5 +++-- src/main/ts/angular.json | 2 +- src/main/ts/src/app/header/header.component.ts | 3 +++ src/main/ts/src/environments/environment.prod.ts | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/bash/minecraft-server/minecraft-server.sh b/src/main/bash/minecraft-server/minecraft-server.sh index 41b5125..2f22097 100644 --- a/src/main/bash/minecraft-server/minecraft-server.sh +++ b/src/main/bash/minecraft-server/minecraft-server.sh @@ -16,6 +16,7 @@ DAEMON_HOME="$MINECRAFT_HOME/server" DAEMON="$DAEMON_HOME/$NAME.jar" PIDFILE="$DAEMON_HOME/$NAME.pid" SCRIPTNAME="$DAEMON_HOME/$0" +JAVA_OPT='-Xms=512M -Xmx=2048M' # *********************************************** # Normal functions for bash commands. @@ -29,7 +30,7 @@ start() else echo "Starting service $NAME" cd $DAEMON_HOME - nohup 2>/dev/null java -jar $DAEMON &>/dev/null & + nohup 2>/dev/null java $JAVA_OPT -jar $DAEMON &>/dev/null & expr $! - 1 > $PIDFILE echo "Service started [`cat $PIDFILE`]\n" fi @@ -89,7 +90,7 @@ api_start() { cd $DAEMON_HOME api_check_error $? - nohup 2>/dev/null java -jar $DAEMON &>/dev/null & + nohup 2>/dev/null java $JAVA_OPT -jar $DAEMON &>/dev/null & api_check_error $? expr $! - 1 > $PIDFILE diff --git a/src/main/ts/angular.json b/src/main/ts/angular.json index ae457b5..e305177 100644 --- a/src/main/ts/angular.json +++ b/src/main/ts/angular.json @@ -17,7 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/ts", + "outputPath": "../resources/static/", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", diff --git a/src/main/ts/src/app/header/header.component.ts b/src/main/ts/src/app/header/header.component.ts index ab5dfa0..e353ebf 100644 --- a/src/main/ts/src/app/header/header.component.ts +++ b/src/main/ts/src/app/header/header.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { AuthService } from '../core/services/auth.service'; +import { environment } from '../../environments/environment'; @Component({ selector: 'app-header', @@ -12,6 +13,8 @@ import { AuthService } from '../core/services/auth.service'; `] }) export class HeaderComponent { + title = environment.title; + constructor( private authService: AuthService ) {} diff --git a/src/main/ts/src/environments/environment.prod.ts b/src/main/ts/src/environments/environment.prod.ts index 3612073..f5dea13 100644 --- a/src/main/ts/src/environments/environment.prod.ts +++ b/src/main/ts/src/environments/environment.prod.ts @@ -1,3 +1,6 @@ export const environment = { - production: true + production: true, + apiUrl: 'http://176.188.217.1:54446', + appVersion: '0.0.1', + title: '' };