Browse Source

Add package type information to system properties

pull/67/head
Igor Kulikov 9 years ago
parent
commit
c745c1ce02
  1. 20
      application/build.gradle
  2. 2
      application/src/main/conf/thingsboard.conf
  3. 13
      application/src/main/java/org/thingsboard/server/controller/AdminController.java
  4. 1
      application/src/main/scripts/windows/service.xml

20
application/build.gradle

@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.tools.ant.filters.ReplaceTokens
buildscript {
ext {
osPackageVersion = "3.8.0"
@ -56,6 +59,7 @@ ospackage {
// Copy the config files
from("target/conf") {
exclude "${pkgName}.conf"
fileType CONFIG | NOREPLACE
fileMode 0754
into "conf"
@ -99,6 +103,14 @@ buildRpm {
into "/usr/lib/systemd/system"
}
from("target/conf") {
include "${pkgName}.conf"
filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm'])
fileType CONFIG | NOREPLACE
fileMode 0754
into "conf"
}
directory(pkgLogFolder, 0755)
link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
@ -126,6 +138,14 @@ buildDeb {
user pkgName
permissionGroup pkgName
from("target/conf") {
include "${pkgName}.conf"
filter(ReplaceTokens, tokens: ['pkg.platform': 'deb'])
fileType CONFIG | NOREPLACE
fileMode 0754
into "conf"
}
directory(pkgLogFolder, 0755)
link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar")
link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")

2
application/src/main/conf/thingsboard.conf

@ -14,6 +14,6 @@
# limitations under the License.
#
export JAVA_OPTS="$JAVA_OPTS"
export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@"
export LOG_FILENAME=${pkg.name}.out
export LOADER_PATH=${pkg.installFolder}/conf,${pkg.installFolder}/extensions

13
application/src/main/java/org/thingsboard/server/controller/AdminController.java

@ -72,4 +72,17 @@ public class AdminController extends BaseController {
throw handleException(e);
}
}
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/updates", method = RequestMethod.GET)
@ResponseBody
public String checkUpdates() throws ThingsboardException {
try {
return "<div>New update Thingsboard version 1.2 is available.<br/>" +
"<a href='https://github.com/thingsboard/thingsboard/releases/download/v1.1/thingsboard-1.1.deb'>Download package</a></div>";
} catch (Exception e) {
throw handleException(e);
}
}
}

1
application/src/main/scripts/windows/service.xml

@ -7,6 +7,7 @@
<logmode>rotate</logmode>
<env name="LOADER_PATH" value="%BASE%\conf,%BASE%\extensions" />
<executable>java</executable>
<startargument>-Dplatform=windows</startargument>
<startargument>-jar</startargument>
<startargument>%BASE%\lib\${pkg.name}.jar</startargument>
</service>

Loading…
Cancel
Save