remove nginx

configuration/kylin.xml

@@ -251,7 +251,7 @@ kylin.engine.spark.max-partition=5000
   </property>
 <property>
     <name>download.location</name>
-    <value>http://10.0.83.123/HDP/2.x/updates/2.6.1.0/kylin/apache-kylin-2.1.0-bin-hbase1x.tar.gz</value>
+    <value>http://repo.packone/hdp/kylin/apache-kylin.tar</value>
     <description>Location to download gstore</description>
  </property> 
 

metainfo.xml

@@ -13,7 +13,6 @@
           <displayName>Kylin All</displayName>
           <category>MASTER</category>
 		  <cardinality>1</cardinality>
-		  <versionAdvertised>true</versionAdvertised>
           <commandScript>
             <script>scripts/kylin_master.py</script>
             <scriptType>PYTHON</scriptType>
@@ -25,31 +24,18 @@
           <displayName>Kylin Query</displayName>
           <category>SLAVE</category>
 		  <cardinality>0+</cardinality>
-		  <versionAdvertised>true</versionAdvertised>
           <commandScript>
             <script>scripts/kylin_query.py</script>
             <scriptType>PYTHON</scriptType>
             <timeout>600</timeout>
           </commandScript>
-        </component>
-		<component>
-          <name>NGINX_SERVER</name>
-          <displayName>Nginx Server</displayName>
-          <category>MASTER</category>
-		  <cardinality>1</cardinality>
-		  <versionAdvertised>true</versionAdvertised>
-          <commandScript>
-            <script>scripts/nginx.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
         </component>
       </components>
 
-      <requiredServices>
+    <requiredServices>
 	    <service>HDFS</service>
 	    <service>HIVE</service>
-		<service>HBASE</service>
+		  <service>HBASE</service>
 	  </requiredServices>
 
       <osSpecifics>

package/scripts/kylin_master.py

@@ -43,7 +43,12 @@ def start(self, env):
         import params
         env.set_params(params)
         self.configure(env)
-        Execute(format(". {tmp_dir}/kylin_env.rc;{install_dir}/latest/bin/kylin.sh start;cp -rf {install_dir}/latest/pid /var/run/kylin.pid"))
+        Execute(format(". {tmp_dir}/kylin_env.rc;{install_dir}/latest/bin/kylin.sh start"))
+        sleep(5)
+        Execute("lsof -i:7070 | grep -v grep | grep \"java\" | awk '{print $2}' >"+format("{install_dir}/latest/pid"))
+        Execute(format("rm -rf /var/run/kylin.pid;cp {install_dir}/latest/pid /var/run/kylin.pid"))
+
+
 
 
     def stop(self, env):

package/scripts/kylin_query.py

@@ -38,7 +38,10 @@ def start(self, env):
         import params
         env.set_params(params)
         self.configure(env)
-        Execute(format(". {tmp_dir}/kylin_env.rc;{install_dir}/latest/bin/kylin.sh start;cp -rf {install_dir}/latest/pid /var/run/kylin.pid"))
+        Execute(format(". {tmp_dir}/kylin_env.rc;{install_dir}/latest/bin/kylin.sh start"))
+        sleep(5)
+        Execute("lsof -i:7070 | grep -v grep | grep \"java\" | awk '{print $2}' >"+format("{install_dir}/latest/pid"))
+        Execute(format("rm -rf /var/run/kylin.pid;cp {install_dir}/latest/pid /var/run/kylin.pid"))
 
 
     def stop(self, env):

package/templates/env.rc.j2

@@ -1,4 +1,4 @@
 export KYLIN_HOME={{install_dir}}/latest
 export HIVE_CONF=/usr/hdp/current/hive-client/conf
 export HCAT_HOME=/usr/hdp/{{hdp_version}}/hive-hcatalog
-export JAVA_HOME='/usr/jdk64/'`ls /usr/jdk64 | xargs echo`
+export JAVA_HOME='/usr/jdk64/default'

quicklinks/quicklinks.json

@@ -8,15 +8,15 @@
         "name": "kylin_ui",
         "label": "KYLIN UI",
         "requires_user_name": "false",
-        "component_name": "NGINX_SERVER",
+        "component_name": "KYLIN_ALL",
         "url":"%@://%@:%@/kylin",
         "port":{
-          "http_property": "nginx_port",
-          "http_default_port": "80",
-          "https_property": "nginx_port",
-          "https_default_port": "80",
+          "http_property": "7070",
+          "http_default_port": "7070",
+          "https_property": "7070",
+          "https_default_port": "7070",
           "regex": "^(\\d+)$",
-          "site": "nginx"
+          "site": "kylin"
         }
       }
     ]