You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/02/14 19:18:30 UTC
svn commit: r1244141 - in /incubator/bigtop/branches/RCs: ./
bigtop-deploy/puppet/manifests/
bigtop-deploy/puppet/modules/hadoop-hbase/manifests/
bigtop-deploy/puppet/modules/hadoop-oozie/manifests/
bigtop-deploy/puppet/modules/hadoop/manifests/ bigtop...
Author: rvs
Date: Tue Feb 14 18:18:28 2012
New Revision: 1244141
URL: http://svn.apache.org/viewvc?rev=1244141&view=rev
Log:
Merging trunk
Added:
incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hdfs.conf
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/mapred.conf
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/install_oozie.sh (contents, props changed)
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/create-package-layout
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.postinst
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.prerm
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.postinst
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.prerm
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.postinst
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.prerm
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.preinst
- copied, changed from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst
Removed:
incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf
incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/create-package-layout
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst
Modified:
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/install_hbase.sh
incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/install_sqoop.sh
incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zoo.cfg
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop.install
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/rules
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/rules
incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
incubator/bigtop/branches/RCs/bigtop.mk
Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp Tue Feb 14 18:18:28 2012
@@ -53,12 +53,6 @@ class hadoop_cluster_node {
$kerberos_kdc_server = extlookup("hadoop_kerberos_kdc_server")
include kerberos::client
- kerberos::client::host_keytab { ["hdfs", "mapred", "hbase", "oozie"]:
- princs_map => { hdfs => [ "host", "hdfs" ],
- mapred => [ "mapred" ],
- hbase => [ "hbase" ],
- oozie => [ "oozie" ], },
- }
}
}
@@ -89,7 +83,7 @@ class hadoop_worker_node inherits hadoop
class hadoop_head_node inherits hadoop_cluster_node {
if ($hadoop_security_authentication == "kerberos") {
- include kerberos::kdc, kerberos::kdc::admin_server
+ include kerberos::server
}
hadoop::namenode { "namenode":
@@ -133,6 +127,7 @@ class hadoop_head_node inherits hadoop_c
}
hadoop::create_hdfs_dirs { [ "/mapred", "/tmp", "/system", "/user", "/hbase", "/benchmarks", "/user/jenkins", "/user/hive" ]:
+ auth => $hadoop_security_authentication,
hdfs_dirs_meta => { "/tmp" => { perm => "777", user => "hdfs" },
"/mapred" => { perm => "755", user => "mapred" },
"/system" => { perm => "755", user => "hdfs" },
Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp Tue Feb 14 18:18:28 2012
@@ -22,6 +22,11 @@ class hadoop-hbase {
class common-server-config {
include client-package
+ if ($kerberos_realm) {
+ require kerberos::client
+ kerberos::host_keytab { "hbase":
+ }
+ }
file { "/etc/hbase/conf/hbase-site.xml":
content => template("hadoop-hbase/hbase-site.xml"),
@@ -51,6 +56,7 @@ class hadoop-hbase {
hasrestart => true,
hasstatus => true,
}
+ Kerberos::Host_keytab <| title == "hbase" |> -> Service["hbase-regionserver"]
}
define master($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
@@ -67,5 +73,6 @@ class hadoop-hbase {
hasrestart => true,
hasstatus => true,
}
+ Kerberos::Host_keytab <| title == "hbase" |> -> Service["hbase-master"]
}
}
Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp Tue Feb 14 18:18:28 2012
@@ -21,6 +21,12 @@ class hadoop-oozie {
}
define server($kerberos_realm = "") {
+ if ($kerberos_realm) {
+ require kerberos::client
+ kerberos::host_keytab { "oozie":
+ }
+ }
+
package { "oozie":
ensure => latest,
}
@@ -36,6 +42,7 @@ class hadoop-oozie {
hasrestart => true,
hasstatus => true,
}
+ Kerberos::Host_keytab <| title == "oozie" |> -> Service["oozie"]
}
}
Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp Tue Feb 14 18:18:28 2012
@@ -19,7 +19,23 @@ class hadoop {
* Common definitions for hadoop nodes.
* They all need these files so we can access hdfs/jobs from any node
*/
+
+ class kerberos {
+ require kerberos::client
+
+ kerberos::host_keytab { "hdfs":
+ princs => [ "host", "hdfs" ],
+ }
+
+ kerberos::host_keytab { [ "yarn", "mapred" ]:
+ }
+ }
+
class common {
+ if ($auth == "kerberos") {
+ include hadoop::kerberos
+ }
+
file {
"/etc/hadoop/conf/core-site.xml":
content => template('hadoop/core-site.xml'),
@@ -88,6 +104,7 @@ class hadoop {
subscribe => [Package["hadoop-datanode"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hdfs-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [ Package["hadoop-datanode"], File[$dirs] ],
}
+ Kerberos::Host_keytab <| title == "hdfs" |> -> Service["hadoop-datanode"]
file { $dirs:
ensure => directory,
@@ -98,10 +115,25 @@ class hadoop {
}
}
- define create_hdfs_dirs($hdfs_dirs_meta) {
+ class kinit {
+ include hadoop::kerberos
+
+ exec { "HDFS kinit":
+ command => "/usr/bin/kinit -kt /etc/hdfs.keytab hdfs/$fqdn && /usr/bin/kinit -R",
+ user => "hdfs",
+ require => Kerberos::Host_keytab["hdfs"],
+ }
+ }
+
+ define create_hdfs_dirs($hdfs_dirs_meta, $auth="simple") {
$user = $hdfs_dirs_meta[$title][user]
$perm = $hdfs_dirs_meta[$title][perm]
+ if ($auth == "kerberos") {
+ require hadoop::kinit
+ Exec["HDFS kinit"] -> Exec["HDFS init $title"]
+ }
+
exec { "HDFS init $title":
user => "hdfs",
command => "/bin/bash -c 'hadoop fs -mkdir $title && hadoop fs -chmod $perm $title && hadoop fs -chown $user $title'",
@@ -132,6 +164,7 @@ class hadoop {
subscribe => [Package["hadoop-namenode"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [Package["hadoop-namenode"], Exec["namenode format"]],
}
+ Kerberos::Host_keytab <| title == "hdfs" |> -> Service["hadoop-namenode"]
exec { "namenode format":
user => "hdfs",
@@ -180,6 +213,7 @@ class hadoop {
mode => 755,
require => [Package["hadoop"]],
}
+ Kerberos::Host_keytab <| title == "mapred" |> -> Service["hadoop-jobtracker"]
}
@@ -216,6 +250,7 @@ class hadoop {
mode => 755,
require => [Package["hadoop"]],
}
+ Kerberos::Host_keytab <| title == "mapred" |> -> Service["hadoop-tasktracker"]
}
@@ -236,6 +271,7 @@ class hadoop {
subscribe => [Package["hadoop-secondarynamenode"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [Package["hadoop-secondarynamenode"]],
}
+ Kerberos::Host_keytab <| title == "hdfs" |> -> Service["hadoop-secondarynamenode"]
}
define client ($namenode_host, $namenode_port, $jobtracker_host, $jobtracker_port, $auth = "simple") {
Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp Tue Feb 14 18:18:28 2012
@@ -61,15 +61,16 @@ class kerberos {
}
class kdc inherits kerberos::site {
- package { "$package_name_kdc":
+ package { $package_name_kdc:
ensure => installed,
}
- file { "$kdc_etc_path":
+ file { $kdc_etc_path:
ensure => directory,
owner => root,
group => root,
mode => "0700",
+ require => Package["$package_name_kdc"],
}
file { "${kdc_etc_path}/kdc.conf":
content => template('kerberos/kdc.conf'),
@@ -98,7 +99,7 @@ class kerberos {
require => [Package["$package_name_kdc"], File["${kdc_etc_path}/kdc.conf"], File["/etc/krb5.conf"]],
}
- service { "$service_name_kdc":
+ service { $service_name_kdc:
ensure => running,
require => [Package["$package_name_kdc"], File["${kdc_etc_path}/kdc.conf"], Exec["kdb5_util"]],
subscribe => File["${kdc_etc_path}/kdc.conf"],
@@ -125,32 +126,50 @@ class kerberos {
}
class client inherits kerberos::site {
- define create_princs {
- exec { "addprinc.$title":
- path => $kerberos::site::exec_path, # BUG: I really shouldn't need to do a FQVN here
- command => "kadmin -w secure -p kadmin/admin -q 'addprinc -randkey $title/$fqdn'",
- unless => "kadmin -w secure -p kadmin/admin -q listprincs | grep -q $title/$fqdn"
- }
+ package { $package_name_client:
+ ensure => installed,
}
+ }
- define host_keytab($fqdn = "$hostname.$domain", $princs_map) {
- $princs = $princs_map[$title]
- $keytab = "/etc/${title}.keytab"
- $exports = inline_template("<%= princs.join('/$fqdn ') + '/$fqdn ' %>")
+ class server {
+ include kerberos::client
- create_princs { $princs:
- }
+ class { "kerberos::kdc": }
+ ->
+ Class["kerberos::client"]
+
+ class { "kerberos::kdc::admin_server": }
+ ->
+ Class["kerberos::client"]
+ }
- exec { "xst.$title":
- path => $kerberos::site::exec_path, # BUG: I really shouldn't need to do a FQVN here
- command => "kadmin -w secure -p kadmin/admin -q 'xst -k $keytab $exports' ; chown $title $keytab",
- unless => "klist -kt $keytab 2>/dev/null | grep -q $title/$fqdn",
- require => [ Create_princs[$princs] ],
- }
+ define create_princs {
+ exec { "addprinc.$title":
+ path => $kerberos::site::exec_path, # BUG: I really shouldn't need to do a FQVN here
+ command => "kadmin -w secure -p kadmin/admin -q 'addprinc -randkey $title/$fqdn'",
+ unless => "kadmin -w secure -p kadmin/admin -q listprincs | grep -q $title/$fqdn",
+ require => Package[$kerberos::site::package_name_client],
}
+ }
- package { "$package_name_client":
- ensure => installed,
+ define host_keytab($fqdn = "$hostname.$domain", $princs = undef) {
+ $real_princs = $princs ? {
+ undef => [ $title ],
+ default => $princs,
+ }
+
+ $keytab = "/etc/${title}.keytab"
+ $exports = inline_template("<%= real_princs.join('/$fqdn ') + '/$fqdn ' %>")
+
+ create_princs { $real_princs:
+ }
+
+ exec { "xst.$title":
+ path => $kerberos::site::exec_path, # BUG: I really shouldn't need to do a FQVN here
+ command => "kadmin -w secure -p kadmin/admin -q 'xst -k $keytab $exports' ; chown $title $keytab",
+ unless => "klist -kt $keytab 2>/dev/null | grep -q $title/$fqdn",
+ require => [ Create_princs[$real_princs] ],
}
}
+
}
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hdfs.conf (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hdfs.conf?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hdfs.conf&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hdfs.conf Tue Feb 14 18:18:28 2012
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hdfs - nofile 32768
-mapred - nofile 32768
+hdfs - nofile 32768
+hdfs - nproc 65536
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/mapred.conf (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/mapred.conf?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/mapred.conf&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/hadoop.nofiles.conf (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/mapred.conf Tue Feb 14 18:18:28 2012
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hdfs - nofile 32768
mapred - nofile 32768
+mapred - nproc 65536
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/install_hbase.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/install_hbase.sh?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/install_hbase.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/install_hbase.sh Tue Feb 14 18:18:28 2012
@@ -44,6 +44,7 @@ OPTS=$(getopt \
-l 'installed-lib-dir:' \
-l 'bin-dir:' \
-l 'examples-dir:' \
+ -l 'conf-dir:' \
-l 'build-dir:' -- "$@")
if [ $? != 0 ] ; then
@@ -74,6 +75,9 @@ while true ; do
--examples-dir)
EXAMPLES_DIR=$2 ; shift 2
;;
+ --conf-dir)
+ CONF_DIR=$2 ; shift 2
+ ;;
--)
shift ; break
;;
@@ -97,6 +101,7 @@ DOC_DIR=${DOC_DIR:-/usr/share/doc/hbase}
LIB_DIR=${LIB_DIR:-/usr/lib/hbase}
BIN_DIR=${BIN_DIR:-/usr/lib/hbase/bin}
ETC_DIR=${ETC_DIR:-/etc/hbase}
+CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
install -d -m 0755 $PREFIX/$LIB_DIR
install -d -m 0755 $PREFIX/$LIB_DIR/lib
@@ -111,7 +116,7 @@ cp -a docs/* $PREFIX/$DOC_DIR
cp *.txt $PREFIX/$DOC_DIR/
cp -a hbase-webapps $PREFIX/$LIB_DIR
-cp -a conf $PREFIX/$ETC_DIR/conf
+cp -a conf $PREFIX/$CONF_DIR
cp -a bin/* $PREFIX/$BIN_DIR
ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/install_oozie.sh (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/create-package-layout)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/install_oozie.sh?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/install_oozie.sh&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/create-package-layout&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/create-package-layout (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/install_oozie.sh Tue Feb 14 18:18:28 2012
@@ -47,6 +47,7 @@ OPTS=$(getopt \
-l 'client-dir:' \
-l 'docs-dir:' \
-l 'initd-dir:' \
+ -l 'conf-dir:' \
-- "$@")
if [ $? != 0 ] ; then
@@ -74,6 +75,9 @@ while true ; do
--initd-dir)
INITDDIR=$2 ; shift 2
;;
+ --conf-dir)
+ CONFDIR=$2 ; shift 2
+ ;;
--)
shift; break
;;
@@ -187,7 +191,7 @@ failIfNotOK
## Install server image
OOZIE_SERVER_DIR=${SERVERDIR}/usr/lib/oozie
-OOZIE_CONF=${SERVERDIR}/etc/oozie
+OOZIE_CONF=${CONFDIR:-"${SERVERDIR}/etc/oozie/conf.dist"}
OOZIE_INITD=${INITDDIR}
OOZIE_DATA=${SERVERDIR}/var/lib/oozie
Propchange: incubator/bigtop/branches/RCs/bigtop-packages/src/common/oozie/install_oozie.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/install_sqoop.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/sqoop/install_sqoop.sh Tue Feb 14 18:18:28 2012
@@ -29,6 +29,7 @@ usage: $0 <options>
--lib-dir=DIR path to install sqoop home [/usr/lib/sqoop]
--installed-lib-dir=DIR path where lib-dir will end up on target system
--bin-dir=DIR path to install bins [/usr/bin]
+ --conf-dir=DIR path to configuration files provided by the package [/etc/sqoop/conf.dist]
--examples-dir=DIR path to install examples [doc-dir/examples]
... [ see source for more similar options ]
"
@@ -41,6 +42,7 @@ OPTS=$(getopt \
-l 'prefix:' \
-l 'doc-dir:' \
-l 'lib-dir:' \
+ -l 'conf-dir:' \
-l 'installed-lib-dir:' \
-l 'bin-dir:' \
-l 'examples-dir:' \
@@ -66,6 +68,9 @@ while true ; do
--lib-dir)
LIB_DIR=$2 ; shift 2
;;
+ --conf-dir)
+ CONF_DIR=$2 ; shift 2
+ ;;
--installed-lib-dir)
INSTALLED_LIB_DIR=$2 ; shift 2
;;
@@ -96,20 +101,17 @@ done
DOC_DIR=${DOC_DIR:-/usr/share/doc/sqoop}
LIB_DIR=${LIB_DIR:-/usr/lib/sqoop}
BIN_DIR=${BIN_DIR:-/usr/lib/sqoop/bin}
-CONF_DIR=/etc/sqoop/
-CONF_DIST_DIR=/etc/sqoop/conf/
ETC_DIR=${ETC_DIR:-/etc/sqoop}
MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
-
-
+CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
install -d -m 0755 ${PREFIX}/${LIB_DIR}
install -d -m 0755 ${PREFIX}/${LIB_DIR}
-cp sqoop*.jar ${PREFIX}/${LIB_DIR}
+cp $BUILD_DIR/sqoop*.jar ${PREFIX}/${LIB_DIR}
install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
-cp -a lib/*.jar ${PREFIX}/${LIB_DIR}/lib
+cp -a $BUILD_DIR/lib/*.jar ${PREFIX}/${LIB_DIR}/lib
#install -d -m 0755 ${PREFIX}/${LIB_DIR}/shims
#cp -a shims/*.jar ${PREFIX}/${LIB_DIR}/shims
@@ -117,19 +119,19 @@ cp -a lib/*.jar ${PREFIX}/${LIB_DIR}/lib
install -d -m 0755 $PREFIX/usr/bin
install -d -m 0755 $PREFIX/${BIN_DIR}
-cp bin/* $PREFIX/${BIN_DIR}
+cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR}
install -d -m 0755 $PREFIX/${DOC_DIR}
-cp docs/*.html $PREFIX/${DOC_DIR}
-cp docs/*.css $PREFIX/${DOC_DIR}
-cp -r docs/api $PREFIX/${DOC_DIR}
-cp -r docs/images $PREFIX/${DOC_DIR}
+cp $BUILD_DIR/docs/*.html $PREFIX/${DOC_DIR}
+cp $BUILD_DIR/docs/*.css $PREFIX/${DOC_DIR}
+cp -r $BUILD_DIR/docs/api $PREFIX/${DOC_DIR}
+cp -r $BUILD_DIR/docs/images $PREFIX/${DOC_DIR}
install -d -m 0755 $PREFIX/$MAN_DIR
for i in sqoop sqoop-codegen sqoop-export sqoop-import-all-tables sqoop-version sqoop-create-hive-table sqoop-help sqoop-list-databases sqoop-eval sqoop-import sqoop-list-tables sqoop-job sqoop-metastore sqoop-merge
do echo "Copying manpage $i"
- cp docs/man/$i* $PREFIX/$MAN_DIR
+ cp $BUILD_DIR/docs/man/$i* $PREFIX/$MAN_DIR
echo "Creating wrapper for $i"
wrapper=$PREFIX/usr/bin/$i
mkdir -p `dirname $wrapper`
@@ -150,8 +152,8 @@ EOF
chmod 0755 $wrapper
done
-install -d -m 0755 $PREFIX/$ETC_DIR/conf
-(cd ${BUILD_DIR}/conf && tar cf - .) | (cd $PREFIX/$ETC_DIR/conf && tar xf -)
+install -d -m 0755 $PREFIX/$CONF_DIR
+(cd ${BUILD_DIR}/conf && tar cf - .) | (cd $PREFIX/$CONF_DIR && tar xf -)
unlink $PREFIX/$LIB_DIR/conf || /bin/true
-ln -s /etc/sqoop/conf $PREFIX/$LIB_DIR/conf
+ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zoo.cfg
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zoo.cfg?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zoo.cfg (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zoo.cfg Tue Feb 14 18:18:28 2012
@@ -26,4 +26,3 @@ syncLimit=5
dataDir=/var/lib/zookeeper
# the port at which the clients will connect
clientPort=2181
-server.0=localhost:2888:3888
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop.install?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop.install Tue Feb 14 18:18:28 2012
@@ -2,5 +2,6 @@
/usr/lib/hadoop
/etc/hadoop/conf.empty
/etc/default/hadoop
-/etc/security/limits.d/hadoop.nofiles.conf
+/etc/security/limits.d/hdfs.conf
+/etc/security/limits.d/mapred.conf
/usr/share/doc/hadoop
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/rules?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/rules Tue Feb 14 18:18:28 2012
@@ -107,7 +107,7 @@ install-arch:
mkdir -p debian/tmp/etc/default
cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse
mkdir -p debian/tmp/etc/security/limits.d
- cp debian/hadoop.nofiles.conf debian/tmp/etc/security/limits.d
+ cp debian/hdfs.conf debian/mapred.conf debian/tmp/etc/security/limits.d
dh_install --sourcedir=debian/tmp -s
# Must not depend on anything. This is to be called by
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.postinst (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hadoop.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.postinst Tue Feb 14 18:18:28 2012
@@ -21,6 +21,7 @@ set -e
case "$1" in
configure)
+ update-alternatives --install /etc/hbase/conf hbase-conf /etc/hbase/conf.dist 30
chown hbase:hbase -R /var/run/hbase /var/log/hbase
;;
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.prerm (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.prerm?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.prerm&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/hbase.prerm Tue Feb 14 18:18:28 2012
@@ -15,42 +15,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# preinst script for zookeeper
+# prerm script for hbase
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
- install|upgrade)
- if ! getent passwd zookeeper >/dev/null; then
- # Adding system user: zookeeper .
- adduser \
- --system \
- --group \
- --home /var/zookeeper \
- --gecos "ZooKeeper User" \
- --shell /bin/false \
- zookeeper >/dev/null
- fi
- install -d -m 0755 -o zookeeper -g zookeeper /var/log/zookeeper
- install -d -m 0755 -o zookeeper -g zookeeper /var/lib/zookeeper
+ remove|upgrade|deconfigure)
+ update-alternatives --remove hbase-conf /etc/hbase/conf.dist || :
;;
- abort-upgrade)
+ failed-upgrade)
;;
*)
- echo "preinst called with unknown argument \`$1'" >&2
+ echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
@@ -61,3 +53,5 @@ esac
#DEBHELPER#
exit 0
+
+
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hbase/rules Tue Feb 14 18:18:28 2012
@@ -52,6 +52,7 @@ install: build
cp debian/hbase.default debian/${hbase_pkg_name}/etc/default/${hbase_pkg_name}
sh -x debian/install_hbase.sh \
--build-dir=. \
+ --conf-dir=/etc/hbase/conf.dist \
--doc-dir=usr/share/doc/${hbase_pkg_name}-doc \
--prefix=debian/tmp
mkdir -p debian/tmp/etc/security/limits.d
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.postinst (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.postinst Tue Feb 14 18:18:28 2012
@@ -15,16 +15,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# postinst script for zookeeper
-
-zookeeper_pkg_name=zookeeper
+# postinst script for oozie
+#
+# see: dh_installdeb(1)
set -e
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
case "$1" in
configure)
- # Install config alternatives
- update-alternatives --install /etc/${zookeeper_pkg_name}/conf ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist 30
+ update-alternatives --install /etc/oozie/conf oozie-conf /etc/oozie/conf.dist 30
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -36,4 +48,5 @@ case "$1" in
;;
esac
-#DEBHELPER#
+exit 0
+
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.prerm (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.prerm?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.prerm&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/oozie-client.prerm Tue Feb 14 18:18:28 2012
@@ -15,42 +15,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# preinst script for zookeeper
+# prerm script for oozie
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
- install|upgrade)
- if ! getent passwd zookeeper >/dev/null; then
- # Adding system user: zookeeper .
- adduser \
- --system \
- --group \
- --home /var/zookeeper \
- --gecos "ZooKeeper User" \
- --shell /bin/false \
- zookeeper >/dev/null
- fi
- install -d -m 0755 -o zookeeper -g zookeeper /var/log/zookeeper
- install -d -m 0755 -o zookeeper -g zookeeper /var/lib/zookeeper
+ remove|upgrade|deconfigure)
+ update-alternatives --remove oozie-conf /etc/oozie/conf.dist || :
;;
- abort-upgrade)
+ failed-upgrade)
;;
*)
- echo "preinst called with unknown argument \`$1'" >&2
+ echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
@@ -61,3 +53,5 @@ esac
#DEBHELPER#
exit 0
+
+
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/rules?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/oozie/rules Tue Feb 14 18:18:28 2012
@@ -59,7 +59,7 @@ install: install-indep
install-indep:
dh_testdir
dh_testroot
- sh -x debian/create-package-layout --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d
+ sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=. --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist
dh_install -i
binary-common:
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/rules?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/rules Tue Feb 14 18:18:28 2012
@@ -45,7 +45,8 @@ install-indep:
dh_testdir
dh_testroot
sh -x debian/install_sqoop.sh \
- --build-dir=. \
+ --build-dir=build/sqoop-${SQOOP_BASE_VERSION} \
+ --conf-dir=/etc/sqoop/conf.dist \
--prefix=debian/sqoop
dh_install -i
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.postinst (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.postinst Tue Feb 14 18:18:28 2012
@@ -15,16 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# postinst script for zookeeper
-
-zookeeper_pkg_name=zookeeper
+# postinst script for sqoop
set -e
case "$1" in
configure)
# Install config alternatives
- update-alternatives --install /etc/${zookeeper_pkg_name}/conf ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist 30
+ update-alternatives --install /etc/sqoop/conf sqoop-conf /etc/sqoop/conf.dist 30
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.prerm (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.prerm?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.prerm&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/sqoop/sqoop.prerm Tue Feb 14 18:18:28 2012
@@ -15,42 +15,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# preinst script for zookeeper
+# prerm script for sqoop
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
- install|upgrade)
- if ! getent passwd zookeeper >/dev/null; then
- # Adding system user: zookeeper .
- adduser \
- --system \
- --group \
- --home /var/zookeeper \
- --gecos "ZooKeeper User" \
- --shell /bin/false \
- zookeeper >/dev/null
- fi
- install -d -m 0755 -o zookeeper -g zookeeper /var/log/zookeeper
- install -d -m 0755 -o zookeeper -g zookeeper /var/lib/zookeeper
+ remove|upgrade|deconfigure)
+ update-alternatives --remove sqoop-conf /etc/sqoop/conf.dist || :
;;
- abort-upgrade)
+ failed-upgrade)
;;
*)
- echo "preinst called with unknown argument \`$1'" >&2
+ echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
@@ -61,3 +53,5 @@ esac
#DEBHELPER#
exit 0
+
+
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.postinst Tue Feb 14 18:18:28 2012
@@ -24,6 +24,7 @@ set -e
case "$1" in
configure)
# Install config alternatives
+ chown -R zookeeper:zookeeper /var/log/zookeeper
update-alternatives --install /etc/${zookeeper_pkg_name}/conf ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist 30
;;
Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.preinst (from r1241664, incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.preinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.preinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst&r1=1241664&r2=1244141&rev=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.preinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper.preinst Tue Feb 14 18:18:28 2012
@@ -37,12 +37,12 @@ case "$1" in
adduser \
--system \
--group \
- --home /var/zookeeper \
+ --home /var/lib/zookeeper \
--gecos "ZooKeeper User" \
--shell /bin/false \
zookeeper >/dev/null
fi
- install -d -m 0755 -o zookeeper -g zookeeper /var/log/zookeeper
+ install -d -m 0755 -o zookeeper -g zookeeper /var/log/zookeeper
install -d -m 0755 -o zookeeper -g zookeeper /var/lib/zookeeper
;;
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec Tue Feb 14 18:18:28 2012
@@ -13,6 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# See BIGTOP-383
+%if %{?suse_version:1}0
+%define _libexecdir /usr/lib
+%endif
+
Name: bigtop-utils
Version: %{bigtop_utils_version}
Release: %{bigtop_utils_release}
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Tue Feb 14 18:18:28 2012
@@ -115,7 +115,8 @@ Source5: hadoop-init.tmpl.suse
Source6: hadoop.1
Source7: hadoop-fuse-dfs.1
Source8: hadoop-fuse.default
-Source9: hadoop.nofiles.conf
+Source9: hdfs.conf
+Source10: mapred.conf
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils
@@ -305,8 +306,7 @@ DataNodes to bind to a low (privileged)
before continuing operation.
%prep
-# %setup -n %{name}-%{hadoop_base_version}
-%setup -n apache-hadoop-common-85219d6
+%setup -n %{name}-%{hadoop_base_version}
%build
# This assumes that you installed Java JDK 6 and set JAVA_HOME
@@ -378,7 +378,8 @@ done
%__cp $RPM_SOURCE_DIR/hadoop-fuse.default $RPM_BUILD_ROOT/etc/default/hadoop-fuse
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
-%__install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/security/limits.d/hadoop.nofiles.conf
+%__install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/security/limits.d/hdfs.conf
+%__install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/etc/security/limits.d/mapred.conf
# /var/lib/hadoop/cache
%__install -d -m 1777 $RPM_BUILD_ROOT/var/lib/%{name}/cache
@@ -423,7 +424,8 @@ fi
%defattr(-,root,root)
%config(noreplace) %{etc_hadoop}/conf.empty
%config(noreplace) /etc/default/hadoop
-%config(noreplace) /etc/security/limits.d/hadoop.nofiles.conf
+%config(noreplace) /etc/security/limits.d/hdfs.conf
+%config(noreplace) /etc/security/limits.d/mapred.conf
%{lib_hadoop}
%{bin_hadoop}/%{name}
%{man_hadoop}/man1/hadoop.1.*z
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Tue Feb 14 18:18:28 2012
@@ -12,7 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-%define etc_hbase /etc/%{name}
+%define etc_hbase_conf %{_sysconfdir}/%{name}/conf
+%define etc_hbase_conf_dist %{etc_hbase_conf}.dist
%define hbase_home /usr/lib/%{name}
%define bin_hbase %{hbase_home}/bin
%define lib_hbase %{hbase_home}/lib
@@ -46,11 +47,13 @@
%define doc_hbase %{_docdir}/%{name}
%global initd_dir %{_sysconfdir}/rc.d
+%define alternatives_cmd update-alternatives
%else
%define doc_hbase %{_docdir}/%{name}-%{hbase_version}
%global initd_dir %{_sysconfdir}/rc.d/init.d
+%define alternatives_cmd alternatives
%endif
@@ -197,7 +200,8 @@ env HBASE_VERSION=%{version} bash %{SOUR
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
--build-dir=. \
- --doc-dir=%{doc_hbase} \
+ --doc-dir=%{doc_hbase} \
+ --conf-dir=%{etc_hbase_conf_dist} \
--prefix=$RPM_BUILD_ROOT
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
@@ -239,6 +243,15 @@ ln -f -s %{hbase_jar_deps} $RPM_BUILD_RO
getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase
getent passwd hbase 2>&1 > /dev/null || /usr/sbin/useradd -c "HBase" -s /sbin/nologin -g hbase -r -d /var/run/hbase hbase 2> /dev/null || :
+%post
+%{alternatives_cmd} --install %{etc_hbase_conf} %{name}-conf %{etc_hbase_conf_dist} 30
+
+%preun
+if [ "$1" = 0 ]; then
+ %{alternatives_cmd} --remove %{name}-conf %{etc_hbase_conf_dist} || :
+fi
+
+
#######################
#### FILES SECTION ####
#######################
@@ -256,7 +269,7 @@ getent passwd hbase 2>&1 > /dev/null ||
%{hbase_home}/hbase-*.jar
%{webapps_hbase}
/usr/bin/hbase
-%config(noreplace) %{etc_hbase}/conf
+%config(noreplace) %{etc_hbase_conf_dist}
%files doc
%defattr(-,root,root)
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Tue Feb 14 18:18:28 2012
@@ -15,15 +15,18 @@
%define usr_bin /usr/bin
%define lib_oozie /usr/lib/oozie
%define man_dir /usr/share/man
-%define conf_oozie /etc/oozie
+%define conf_oozie %{_sysconfdir}/%{name}/conf
+%define conf_oozie_dist %{conf_oozie}.dist
%define data_oozie /var/lib/oozie
%if %{!?suse_version:1}0
%define doc_oozie %{_docdir}/oozie-%{oozie_version}
%define initd_dir %{_sysconfdir}/rc.d/init.d
+ %define alternatives_cmd alternatives
%else
%define doc_oozie %{_docdir}/oozie
%define initd_dir %{_sysconfdir}/rc.d
+ %define alternatives_cmd update-alternatives
%endif
Name: oozie
@@ -36,7 +39,7 @@ Buildroot: %{_topdir}/INSTALL/%{name}-%{
License: APL2
Source0: %{name}-%{oozie_base_version}.tar.gz
Source1: do-component-build
-Source2: create-package-layout
+Source2: install_oozie.sh
Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
Requires(post): /sbin/chkconfig, hadoop
Requires(preun): /sbin/chkconfig, /sbin/service
@@ -115,7 +118,7 @@ Requires: bigtop-utils
%install
%__rm -rf $RPM_BUILD_ROOT
- sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=. --server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT --docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir}
+ sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=. --server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT --docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir} --conf-dir=$RPM_BUILD_ROOT%{conf_oozie_dist}
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
@@ -141,6 +144,14 @@ if [ $1 -ge 1 ]; then
/sbin/service oozie condrestart > /dev/null
fi
+%post client
+%{alternatives_cmd} --install %{conf_oozie} %{name}-conf %{conf_oozie_dist} 30
+
+%preun client
+if [ "$1" = 0 ]; then
+ %{alternatives_cmd} --remove %{name}-conf %{conf_oozie_dist} || :
+fi
+
%files
%defattr(-,root,root)
%{lib_oozie}/bin/addtowar.sh
@@ -154,7 +165,6 @@ fi
%{lib_oozie}/oozie.war
%{lib_oozie}/oozie-sharelib.tar.gz
%{lib_oozie}/oozie-server
-%config(noreplace) %{conf_oozie}
%{initd_dir}/oozie
%defattr(-, oozie, oozie)
%dir %{_localstatedir}/log/oozie
@@ -163,6 +173,7 @@ fi
%files client
%defattr(-,root,root)
+%config(noreplace) %{conf_oozie_dist}
%{usr_bin}/oozie
%dir %{lib_oozie}/bin
%{lib_oozie}/bin/oozie
Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Tue Feb 14 18:18:28 2012
@@ -13,17 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
%define lib_sqoop /usr/lib/sqoop
+%define conf_sqoop %{_sysconfdir}/%{name}/conf
+%define conf_sqoop_dist %{conf_sqoop}.dist
%if %{?suse_version:1}0
%define doc_sqoop %{_docdir}/sqoop
%global initd_dir %{_sysconfdir}/rc.d
+%define alternatives_cmd update-alternatives
%else
%define doc_sqoop %{_docdir}/sqoop-%{sqoop_version}
%global initd_dir %{_sysconfdir}/rc.d/init.d
+%define alternatives_cmd alternatives
%endif
@@ -87,7 +91,8 @@ bash %{SOURCE1} -Dversion=%{version}
%install
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
- --build-dir=. \
+ --build-dir=build/sqoop-%{sqoop_base_version} \
+ --conf-dir=%{conf_sqoop_dist} \
--doc-dir=%{doc_sqoop} \
--prefix=$RPM_BUILD_ROOT
@@ -114,6 +119,14 @@ getent group sqoop >/dev/null || groupad
getent passwd sqoop > /dev/null || useradd -c "Sqoop" -s /sbin/nologin \
-g sqoop -r -d /var/lib/sqoop sqoop 2> /dev/null || :
+%post
+%{alternatives_cmd} --install %{conf_sqoop} %{name}-conf %{conf_sqoop_dist} 30
+
+%preun
+if [ "$1" = 0 ]; then
+ %{alternatives_cmd} --remove %{name}-conf %{conf_sqoop_dist} || :
+fi
+
%post metastore
chkconfig --add sqoop-metastore
@@ -137,7 +150,7 @@ fi
%files
%defattr(0755,root,root)
%{lib_sqoop}
-%config(noreplace) %{_sysconfdir}/sqoop/conf
+%config(noreplace) %{conf_sqoop_dist}
%{_bindir}/sqoop
%{_bindir}/sqoop-codegen
%{_bindir}/sqoop-create-hive-table
Modified: incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml (original)
+++ incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml Tue Feb 14 18:18:28 2012
@@ -1336,6 +1336,14 @@
<file name="/usr/share/man/man1/sqoop-metastore.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
<file name="/usr/share/man/man1/sqoop-version.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <sqoop-conf>
+ <status>auto</status>
+ <link>/etc/sqoop/conf</link>
+ <value>/etc/sqoop/conf.dist</value>
+ <alt>/etc/sqoop/conf.dist</alt>
+ </sqoop-conf>
+ </alternatives>
</sqoop>
<sqoop-metastore>
<metadata>
@@ -2354,6 +2362,14 @@
<file name="/usr/lib/oozie/lib/alfredo-0.1.4.jar" owners="1" perm="-rw-r--r--" user="root" group="root"/>
<file name="/usr/lib/oozie/lib/commons-lang-2.4.jar" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <oozie-conf>
+ <status>auto</status>
+ <link>/etc/oozie/conf</link>
+ <value>/etc/oozie/conf.dist</value>
+ <alt>/etc/oozie/conf.dist</alt>
+ </oozie-conf>
+ </alternatives>
</oozie-client>
<zookeeper>
<metadata>
@@ -7243,6 +7259,14 @@
<file name="/usr/lib/hbase/lib/hadoop-core.jar" owners="1" perm="lrwxrwxrwx" user="root" group="root" target="../../hadoop/hadoop-core.jar"/>
<file name="/usr/lib/hbase/conf" owners="1" perm="lrwxrwxrwx" user="root" group="root" target="/etc/hbase/conf"/>
</content>
+ <alternatives>
+ <hbase-conf>
+ <status>auto</status>
+ <value>/etc/hbase/conf.dist</value>
+ <link>/etc/hbase/conf</link>
+ <alt>/etc/hbase/conf.dist</alt>
+ </hbase-conf>
+ </alternatives>
<groups>
<hbase>
<user>hbase</user>
Modified: incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml (original)
+++ incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml Tue Feb 14 18:18:28 2012
@@ -1308,6 +1308,14 @@ also on potential use cases. Come to the
<doc name="/usr/share/man/man1/sqoop-version.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
<doc name="/usr/share/man/man1/sqoop.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <sqoop-conf>
+ <status>auto</status>
+ <link>/etc/sqoop/conf</link>
+ <value>/etc/sqoop/conf.dist</value>
+ <alt>/etc/sqoop/conf.dist</alt>
+ </sqoop-conf>
+ </alternatives>
</sqoop>
<sqoop-metastore>
<metadata>
@@ -2311,6 +2319,14 @@ also on potential use cases. Come to the
<doc name="/usr/share/doc/oozie/release-log.txt" owners="1" perm="-rw-r--r--" user="root" group="root"/>
<doc name="/usr/share/man/man1/oozie.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <oozie-conf>
+ <status>auto</status>
+ <link>/etc/oozie/conf</link>
+ <value>/etc/oozie/conf.dist</value>
+ <alt>/etc/oozie/conf.dist</alt>
+ </oozie-conf>
+ </alternatives>
</oozie-client>
<zookeeper>
<metadata>
@@ -7286,6 +7302,14 @@ difficult to manage. Even when done corr
<file name="/usr/lib/hbase/lib/zookeeper.jar" owners="1" perm="lrwxrwxrwx" user="hbase" group="hbase" target="/usr/lib/zookeeper/zookeeper.jar"/>
<doc name="/usr/share/man/man1/hbase.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <hbase-conf>
+ <status>auto</status>
+ <value>/etc/hbase/conf.dist</value>
+ <link>/etc/hbase/conf</link>
+ <alt>/etc/hbase/conf.dist</alt>
+ </hbase-conf>
+ </alternatives>
<groups>
<hbase>
<user>hbase</user>
Modified: incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml (original)
+++ incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml Tue Feb 14 18:18:28 2012
@@ -1570,6 +1570,14 @@ also on potential use cases. Come to the
<doc name="/usr/share/man/man1/sqoop-version.1.gz" perm="-rw-r--r--" group="root" owners="-1" user="root"/>
<doc name="/usr/share/man/man1/sqoop.1.gz" perm="-rw-r--r--" group="root" owners="-1" user="root"/>
</content>
+ <alternatives>
+ <sqoop-conf>
+ <status>auto</status>
+ <link>/etc/sqoop/conf</link>
+ <value>/etc/sqoop/conf.dist</value>
+ <alt>/etc/sqoop/conf.dist</alt>
+ </sqoop-conf>
+ </alternatives>
</sqoop>
<sqoop-metastore>
<metadata>
@@ -4124,6 +4132,14 @@ also on potential use cases. Come to the
<doc name="/usr/share/doc/oozie-%{package_version}/target/site/index.html" perm="-rw-r--r--" group="root" owners="-1" user="root"/>
<doc name="/usr/share/man/man1/oozie.1.gz" perm="-rw-r--r--" group="root" owners="-1" user="root"/>
</content>
+ <alternatives>
+ <oozie-conf>
+ <status>auto</status>
+ <link>/etc/oozie/conf</link>
+ <value>/etc/oozie/conf.dist</value>
+ <alt>/etc/oozie/conf.dist</alt>
+ </oozie-conf>
+ </alternatives>
</oozie-client>
<zookeeper>
<metadata>
@@ -9062,6 +9078,14 @@ difficult to manage. Even when done corr
<file name="/var/log/hbase" perm="drwxr-xr-x" group="hbase" owners="-1" user="hbase"/>
<file name="/var/run/hbase" perm="drwxr-xr-x" group="hbase" owners="-1" user="hbase"/>
</content>
+ <alternatives>
+ <hbase-conf>
+ <status>auto</status>
+ <value>/etc/hbase/conf.dist</value>
+ <link>/etc/hbase/conf</link>
+ <alt>/etc/hbase/conf.dist</alt>
+ </hbase-conf>
+ </alternatives>
<groups>
<hbase>
<user>hbase</user>
Modified: incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml (original)
+++ incubator/bigtop/branches/RCs/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml Tue Feb 14 18:18:28 2012
@@ -1308,6 +1308,14 @@ also on potential use cases. Come to the
<doc name="/usr/share/man/man1/sqoop-version.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
<doc name="/usr/share/man/man1/sqoop.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <sqoop-conf>
+ <status>auto</status>
+ <link>/etc/sqoop/conf</link>
+ <value>/etc/sqoop/conf.dist</value>
+ <alt>/etc/sqoop/conf.dist</alt>
+ </sqoop-conf>
+ </alternatives>
</sqoop>
<sqoop-metastore>
<metadata>
@@ -2311,6 +2319,14 @@ also on potential use cases. Come to the
<doc name="/usr/share/doc/packages/oozie/release-log.txt" owners="1" perm="-rw-r--r--" user="root" group="root"/>
<doc name="/usr/share/man/man1/oozie.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <oozie-conf>
+ <status>auto</status>
+ <link>/etc/oozie/conf</link>
+ <value>/etc/oozie/conf.dist</value>
+ <alt>/etc/oozie/conf.dist</alt>
+ </oozie-conf>
+ </alternatives>
</oozie-client>
<zookeeper>
<metadata>
@@ -7206,6 +7222,14 @@ difficult to manage. Even when done corr
<file name="/usr/lib/hbase/lib/zookeeper.jar" owners="1" perm="lrwxrwxrwx" user="hbase" group="hbase" target="/usr/lib/zookeeper/zookeeper.jar"/>
<doc name="/usr/share/man/man1/hbase.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
</content>
+ <alternatives>
+ <hbase-conf>
+ <status>auto</status>
+ <value>/etc/hbase/conf.dist</value>
+ <link>/etc/hbase/conf</link>
+ <alt>/etc/hbase/conf.dist</alt>
+ </hbase-conf>
+ </alternatives>
<groups>
<hbase>
<user>hbase</user>
Modified: incubator/bigtop/branches/RCs/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop.mk?rev=1244141&r1=1244140&r2=1244141&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop.mk (original)
+++ incubator/bigtop/branches/RCs/bigtop.mk Tue Feb 14 18:18:28 2012
@@ -18,14 +18,14 @@ BIGTOP_VERSION=0.3.0-incubating
# Hadoop 0.20.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=1.0.1
+HADOOP_BASE_VERSION=1.0.0
HADOOP_PKG_VERSION=$(HADOOP_BASE_VERSION)
HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
-#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
-HADOOP_TARBALL_SRC=85219d646877f71730fefbefec7c5448ec0ccc15
-HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
+HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
+HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+#HADOOP_TARBALL_SRC=85219d646877f71730fefbefec7c5448ec0ccc15
+#HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
$(eval $(call PACKAGE,hadoop,HADOOP))
# ZooKeeper
@@ -33,12 +33,11 @@ ZOOKEEPER_NAME=zookeeper
ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper
ZOOKEEPER_PKG_NAME=zookeeper
ZOOKEEPER_BASE_VERSION=3.4.3
-ZOOKEEPER_PKG_VERSION=$(ZOOKEEPER_BASE_VERSION)
+ZOOKEEPER_PKG_VERSION=3.4.3
ZOOKEEPER_RELEASE_VERSION=1
ZOOKEEPER_TARBALL_DST=zookeeper-$(ZOOKEEPER_BASE_VERSION).tar.gz
ZOOKEEPER_TARBALL_SRC=$(ZOOKEEPER_TARBALL_DST)
-#ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-$(ZOOKEEPER_BASE_VERSION)/
-ZOOKEEPER_SITE=http://people.apache.org/~mahadev/zookeeper-3.4.3-candidate-0/
+ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-$(ZOOKEEPER_BASE_VERSION)/
$(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
# HBase
@@ -81,24 +80,26 @@ $(eval $(call PACKAGE,hive,HIVE))
SQOOP_NAME=sqoop
SQOOP_RELNOTES_NAME=Sqoop
SQOOP_PKG_NAME=sqoop
-SQOOP_BASE_VERSION=1.4.0-incubating
-SQOOP_PKG_VERSION=1.4.0
+SQOOP_BASE_VERSION=1.4.1-incubating
+SQOOP_PKG_VERSION=1.4.1
SQOOP_RELEASE_VERSION=1
SQOOP_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION).tar.gz
-SQOOP_TARBALL_SRC=$(SQOOP_TARBALL_DST)
-SQOOP_SITE=$(APACHE_MIRROR)/incubator/$(SQOOP_NAME)/$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)/
+SQOOP_TARBALL_SRC=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)-src.tar.gz
+#SQOOP_SITE=$(APACHE_MIRROR)/incubator/$(SQOOP_NAME)/$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)/
+SQOOP_SITE=http://people.apache.org/~jarcec/sqoop-1.4.1-incubating-rc3/
$(eval $(call PACKAGE,sqoop,SQOOP))
# Oozie
OOZIE_NAME=oozie
OOZIE_RELNOTES_NAME=Apache Oozie
OOZIE_PKG_NAME=oozie
-OOZIE_BASE_VERSION=2.3.2
-OOZIE_PKG_VERSION=2.3.2
+OOZIE_BASE_VERSION=3.1.3-incubating
+OOZIE_PKG_VERSION=3.1.3
OOZIE_RELEASE_VERSION=1
-OOZIE_TARBALL_DST=oozie-2.3.2.tar.gz
-OOZIE_TARBALL_SRC=2.3.2
-OOZIE_SITE=http://github.com/yahoo/oozie/tarball
+OOZIE_TARBALL_SRC=$(OOZIE_NAME)-$(OOZIE_BASE_VERSION)-src.tar.gz
+OOZIE_TARBALL_DST=$(OOZIE_NAME)-$(OOZIE_BASE_VERSION).tar.gz
+#OOZIE_SITE=http://github.com/yahoo/oozie/tarball
+OOZIE_SITE=http://people.apache.org/~kamrul/oozie-3.1.3-incubating-candidate-2/
$(eval $(call PACKAGE,oozie,OOZIE))
# Whirr