aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-05-09 22:32:40 +0200
committerOlaf Flebbe <of@oflebbe.de>2015-05-10 11:22:22 +0200
commit1f47e277302012b0f66286ad6f0e52c51658e969 (patch)
tree1041fb476c3d0021a595234066dd8a6ba3f1ce0f
parent52077c6250925b8f470f0027ea79b077190e8e16 (diff)
downloadbigtop-odpi-1f47e277302012b0f66286ad6f0e52c51658e969.tar.gz
BIGTOP-1869: Hue 3.8.1 refinements
-rw-r--r--bigtop-packages/src/deb/hue/compat2
-rw-r--r--bigtop-packages/src/deb/hue/control34
-rwxr-xr-xbigtop-packages/src/deb/hue/rules2
-rw-r--r--bigtop-packages/src/rpm/hue/SPECS/hue.spec29
-rw-r--r--bigtop_toolchain/manifests/packages.pp4
5 files changed, 51 insertions, 20 deletions
diff --git a/bigtop-packages/src/deb/hue/compat b/bigtop-packages/src/deb/hue/compat
index 7f8f011e..ec635144 100644
--- a/bigtop-packages/src/deb/hue/compat
+++ b/bigtop-packages/src/deb/hue/compat
@@ -1 +1 @@
-7
+9
diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control
index 34c99201..7b57fbcb 100644
--- a/bigtop-packages/src/deb/hue/control
+++ b/bigtop-packages/src/deb/hue/control
@@ -18,12 +18,12 @@ Section: misc
Priority: extra
Maintainer: Apache Bigtopr <dev@bigtop.apache.org>
Build-Depends: debhelper (>= 7.0.50~), python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools, libkrb5-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.9.4
Homepage: http://github.com/cloudera/hue
Package: hue-common
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${build:SYS-PYTHON}, libsasl2-modules-gssapi-mit, libxslt1.1, make
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${build:SYS-PYTHON}, libsasl2-modules-gssapi-mit, libxslt1.1, make, python (>= 2.6)
Description: A browser-based desktop interface for Hadoop
Hue is a browser-based desktop interface for interacting with Hadoop.
It supports a file browser, job tracker interface, cluster health monitor, and more.
@@ -37,7 +37,7 @@ Description: The hue metapackage
Package: hue-server
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, hue-common (= ${source:Version})
+Depends: ${misc:Depends}, hue-common (= ${source:Version})
Description: Service Scripts for Hue
This package provides the service scripts for Hue server.
@@ -48,7 +48,7 @@ Description: Documentation for Hue
Package: hue-beeswax
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}), hive (>= 0.13)
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}), hive (>= 0.13)
Description: A UI for Hive on Hue
Beeswax is a web interface for Hive.
.
@@ -57,7 +57,7 @@ Description: A UI for Hive on Hue
Package: hue-impala
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Impala
A web interface for Impala.
.
@@ -66,7 +66,7 @@ Description: A UI for Impala
Package: hue-pig
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Pig on Hue
A web interface for Pig.
.
@@ -74,7 +74,7 @@ Description: A UI for Pig on Hue
Package: hue-hbase
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for HBase on Hue
A web interface for HBase.
.
@@ -82,13 +82,13 @@ Description: A UI for HBase on Hue
Package: hue-sqoop
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Sqoop on Hue
A web interface to Sqoop.
Package: hue-search
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Search on Hue
A web interface to Search.
.
@@ -96,7 +96,7 @@ Description: A UI for Search on Hue
Package: hue-rdbms
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for RDBMS on Hue
A web interface to RDBMS.
.
@@ -104,7 +104,7 @@ Description: A UI for RDBMS on Hue
Package: hue-security
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Spark on Hue
A web interface to roles and security.
.
@@ -112,15 +112,23 @@ Description: A UI for Spark on Hue
Package: hue-spark
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Spark on Hue
A web interface to Spark.
.
It allows users to interact with Spark
+Package: hue-useradmin
+Architecture: all
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Description: A UI for user administration
+ A web interface for user administration
+ .
+ It allows users to administration of users
+
Package: hue-zookeeper
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
+Depends: ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version})
Description: A UI for Zookeeper on Hue
A web interface to Zookeeper.
.
diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules
index 2ff28c7b..041e8f97 100755
--- a/bigtop-packages/src/deb/hue/rules
+++ b/bigtop-packages/src/deb/hue/rules
@@ -23,7 +23,7 @@
# Implicit targets
SHELL := /bin/bash
-APPS=beeswax impala pig hbase sqoop search security rdbms spark zookeeper
+APPS=beeswax impala pig hbase sqoop search security rdbms spark useradmin zookeeper
$(APPS:%=debian/hue-%.postinst): debian/hue-app.postinst.tpl
sed -e 's#@APP@#$(patsubst debian/hue-%.postinst,%,$@)#' < $< > $@
diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
index 93e36223..a7f1fb74 100644
--- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec
+++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
@@ -26,6 +26,7 @@ Source1: %{name}.init
Source2: %{name}.init.suse
Source3: do-component-build
Source4: install_hue.sh
+Source5: bigtop.bom
#BIGTOP_PATCH_FILES
URL: http://github.com/cloudera/hue
Requires: %{name}-common = %{version}-%{release}
@@ -40,6 +41,7 @@ Requires: %{name}-rdbms = %{version}-%{release}
Requires: %{name}-security = %{version}-%{release}
Requires: %{name}-spark = %{version}-%{release}
Requires: %{name}-zookeeper = %{version}-%{release}
+Requires: %{name}-useradmin = %{version}-%{release}
################ RPM CUSTOMIZATION ##############################
@@ -101,6 +103,7 @@ AutoReqProv: no
%define sqoop_app_dir %{hue_dir}/apps/sqoop
%define search_app_dir %{hue_dir}/apps/search
%define rdbms_app_dir %{hue_dir}/apps/rdbms
+%define useradmin_app_dir %{hue_dir}/apps/useradmin
%define spark_app_dir %{hue_dir}/apps/spark
%define zookeeper_app_dir %{hue_dir}/apps/zookeeper
@@ -179,13 +182,13 @@ cp $orig_init_file $RPM_BUILD_ROOT/%{initd_dir}/hue
%package -n %{name}-common
Summary: A browser-based desktop interface for Hadoop
BuildRequires: python-devel, python-setuptools, gcc, gcc-c++
-BuildRequires: libxml2-devel, libxslt-devel, zlib-devel
+BuildRequires: libxml2-devel, libxslt-devel, zlib-devel, libyaml-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: openssl-devel
BuildRequires: krb5-devel
BuildRequires: asciidoc
Group: Applications/Engineering
-Requires: cyrus-sasl-gssapi, libxml2, libxslt, zlib, python, sqlite
+Requires: cyrus-sasl-gssapi, libxml2, libxslt, zlib, python, sqlite, libyaml
# The only reason we need the following is because we also have AutoProv: no
Provides: config(%{name}-common) = %{version}
@@ -269,7 +272,8 @@ fi
%{hue_dir}/VERSION
%{hue_dir}/build/env/bin/*
%{hue_dir}/build/env/include/
-%{hue_dir}/build/env/lib*/
+%{hue_dir}/build/env/lib/
+%{hue_dir}/build/env/lib64
%{hue_dir}/build/env/stamp
%{hue_dir}/app.reg
%{hue_dir}/apps/Makefile
@@ -298,6 +302,7 @@ fi
%exclude %{rdbms_app_dir}
%exclude %{spark_app_dir}
%exclude %{zookeeper_app_dir}
+%exclude %{useradmin_app_dir}
############################################################
@@ -492,6 +497,24 @@ It allows users to interact with Roles and Security
%defattr(-, %{username}, %{username})
%{security_app_dir}
+#### HUE-USERADMIN PLUGIN ######
+%package -n %{name}-useradmin
+Summary: A UI for Hue user administration
+Group: Applications/Engineering
+Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{name}-useradmin
+A web interface for Hue user administration
+
+It allows for Hue user administration
+
+%app_post_macro useradmin
+%app_preun_macro useradmin
+
+%files -n %{name}-useradmin
+%defattr(-, %{username}, %{username})
+%{useradmin_app_dir}
+
#### HUE-SPARK PLUGIN ######
%package -n %{name}-spark
Summary: A UI for Spark on Hue
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 2f2fc232..05697cd1 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -22,11 +22,11 @@ class bigtop_toolchain::packages {
} else {
$mysql_devel="mariadb-devel"
}
- $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto" ]
+ $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto", "libyaml-devel" ]
}
/(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "libcppunit-devel", "libopenssl-devel", "rpm-devel", "pkg-config" ] }
Amazon: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "openssl-devel", "rpm-build", "system-rpm-config", "fuse-libs", ] }
- /(Ubuntu|Debian)/: { $pkgs = [ "unzip", "curl", "wget", "git-core", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "g++", "fuse", "reprepro", "liblzo2-dev", "libfuse-dev", "libcppunit-dev", "libssl-dev", "libzip-dev", "sharutils", "pkg-config", "debhelper", "devscripts", "build-essential", "dh-make", "libfuse2", "libssh-dev", "libjansi-java", "python2.7-dev", "libxml2-dev", "libxslt1-dev", "zlib1g-dev", "libsqlite3-dev", "libldap2-dev", "libsasl2-dev", "libmysqlclient-dev", "python-setuptools", "libkrb5-dev", "asciidoc" ]
+ /(Ubuntu|Debian)/: { $pkgs = [ "unzip", "curl", "wget", "git-core", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "g++", "fuse", "reprepro", "liblzo2-dev", "libfuse-dev", "libcppunit-dev", "libssl-dev", "libzip-dev", "sharutils", "pkg-config", "debhelper", "devscripts", "build-essential", "dh-make", "libfuse2", "libssh-dev", "libjansi-java", "python2.7-dev", "libxml2-dev", "libxslt1-dev", "zlib1g-dev", "libsqlite3-dev", "libldap2-dev", "libsasl2-dev", "libmysqlclient-dev", "python-setuptools", "libkrb5-dev", "asciidoc", "libyaml-dev" ]
exec { "apt-update":
command => "/usr/bin/apt-get update"