Browse Source

Fixed installation script

pull/725/head
Andrew Shvayka 9 years ago
parent
commit
05f92cbe65
  1. 4
      application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
  2. 2
      application/src/main/resources/thingsboard.yml

4
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java

@ -187,7 +187,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
@Override @Override
public void loadSystemRules() throws Exception { public void loadSystemRules() throws Exception {
loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null); // loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null);
} }
@Override @Override
@ -228,7 +228,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
"Raspberry Pi GPIO control sample application"); "Raspberry Pi GPIO control sample application");
loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId()); loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId());
loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId()); // loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId());
loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null); loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null);
} }

2
application/src/main/resources/thingsboard.yml

@ -133,7 +133,7 @@ quota:
intervalMin: 2 intervalMin: 2
database: database:
type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql type: "${DATABASE_TYPE:sql}" # cassandra OR sql
# Cassandra driver configuration parameters # Cassandra driver configuration parameters
cassandra: cassandra:

Loading…
Cancel
Save