adding quicklink

abajwa-hw · Sep 20, 2016 · 156f7bf · 156f7bf
1 parent 089b53b
commit 156f7bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/configuration/solr-env.xml b/configuration/solr-env.xml
@@ -16,6 +16,12 @@
     <description>Solr port</description>
   </property> 
 
+  <property>
+    <name>solr.ssl</name>
+    <value>false</value>
+    <description>SSL not yet supported</description>
+  </property>
+
   <property>
     <name>solr.log.dir</name>
     <value>/var/log/solr</value>

diff --git a/metainfo.xml b/metainfo.xml
@@ -49,6 +49,12 @@
         	<config-type>solr-config</config-type>
       	    </configuration-dependencies>
             <restartRequiredAfterChange>false</restartRequiredAfterChange>
+            <quickLinksConfigurations>
+              <quickLinksConfiguration>
+                <fileName>quicklinks.json</fileName>
+                <default>true</default>
+              </quickLinksConfiguration>
+            </quickLinksConfigurations>              
         </service>
     </services>
 </metainfo>
diff --git a/package/scripts/master.py b/package/scripts/master.py
@@ -129,7 +129,7 @@ def start(self, env):
       Execute(format('SOLR_INCLUDE={solr_conf}/solr.in.sh {solr_bindir}/solr start -cloud -noprompt -s {solr_datadir} >> {solr_log}'), user=params.solr_user)
 
       if params.demo_mode:
-        Execute(format('SOLR_INCLUDE={solr_conf}/solr.in.sh {solr_bindir}/solr create -c tweets -d data_driven_schema_configs -s 1 -rf 1 >> {solr_log}'), user=params.solr_user)
+        Execute(format('SOLR_INCLUDE={solr_conf}/solr.in.sh {solr_bindir}/solr create -c tweets -d data_driven_schema_configs -s 1 -rf 1 >> {solr_log}'), user=params.solr_user, ignore_failures=True)
 
     else:
       cmd = params.service_packagedir + '/scripts/start.sh ' + params.solr_dir + ' ' + params.solr_log + ' ' + status_params.solr_pidfile + ' ' + params.solr_bindir