简柏林 / thingskit · Commits

Commit 05f92cbe656478626a83db0cbdb9da2698f91ac1

Authored by Andrew Shvayka
1 parent 4ecb106a

Fixed installation script

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -187,7 +187,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { @@ -187,7 +187,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
187 187
188 @Override 188 @Override
189 public void loadSystemRules() throws Exception { 189 public void loadSystemRules() throws Exception {
190 - loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null); 190 +// loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null);
191 } 191 }
192 192
193 @Override 193 @Override
@@ -228,7 +228,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { @@ -228,7 +228,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
228 "Raspberry Pi GPIO control sample application"); 228 "Raspberry Pi GPIO control sample application");
229 229
230 loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId()); 230 loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId());
231 - loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId()); 231 +// loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId());
232 loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null); 232 loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null);
233 } 233 }
234 234
@@ -133,7 +133,7 @@ quota: @@ -133,7 +133,7 @@ quota:
133 intervalMin: 2 133 intervalMin: 2
134 134
135 database: 135 database:
136 - type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql 136 + type: "${DATABASE_TYPE:sql}" # cassandra OR sql
137 137
138 # Cassandra driver configuration parameters 138 # Cassandra driver configuration parameters
139 cassandra: 139 cassandra: