You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/02/12 13:28:31 UTC
[1/2] git commit: refs/heads/master - CLOUDSTACK-1066: Add random
password for cloud, fix trailing whitespaces, cleanup isos
CLOUDSTACK-1066: Add random password for cloud, fix trailing whitespaces, cleanup isos
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4b268c4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4b268c4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4b268c4a
Branch: refs/heads/master
Commit: 4b268c4ae68413b3a53173c3f1035b9539f682af
Parents: bd034e0
Author: Rohit Yadav <bh...@apache.org>
Authored: Tue Feb 12 17:56:30 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Tue Feb 12 17:58:17 2013 +0530
----------------------------------------------------------------------
.../definitions/systemvmtemplate/cleanup.sh | 3 +
.../systemvmtemplate/cloudstack-packages.sh | 46 ++++++++------
2 files changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4b268c4a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index c6a1e90..abecc56 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -18,3 +18,6 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
echo "pre-up sleep 2" >> /etc/network/interfaces
+# Clean up any copied iso or scripts
+rm -v /root/*.iso
+rm -v /root/*.sh
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4b268c4a/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh b/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh
index 9a40253..320a515 100644
--- a/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh
@@ -26,10 +26,10 @@ install_packages() {
DEBIAN_PRIORITY=critical
#basic stuff
- apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables
- apt-get --no-install-recommends -q -y --force-yes install openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget
- apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping
- apt-get --no-install-recommends -q -y --force-yes install dnsutils zip unzip ethtool uuid file iproute acpid virt-what sudo
+ apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables
+ apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget
+ apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping
+ apt-get --no-install-recommends -q -y --force-yes install dnsutils zip unzip ethtool uuid file iproute acpid virt-what sudo
#sysstat
echo 'sysstat sysstat/enable boolean true' | debconf-set-selections
@@ -65,21 +65,20 @@ install_packages() {
apt-get --no-install-recommends -q -y --force-yes install iptables-persistent
}
-accounts() {
+setup_accounts() {
# Setup sudo to allow no-password sudo for "admin"
groupadd -r admin
#create a 'cloud' user
useradd -G admin cloud
- echo "root:$PASSWORD" | chpasswd
- #FIXME: create random password for cloud
- #FIXME: disable password auth in sshd (final step, after veewee is done)
+ echo "root:$ROOTPW" | chpasswd
+ echo "cloud:`openssl rand -base64 32`" | chpasswd
+ #FIXME: disable password auth in sshd (final step, after veewee is done)
#echo "cloud:password" | chpasswd
sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
-
+
mkdir -p /home/cloud/.ssh
chmod 700 /home/cloud/.ssh
-
}
fix_nameserver() {
@@ -98,7 +97,7 @@ do_fixes() {
echo "$HOSTNAME" > /etc/hostname
hostname $HOSTNAME
#delete entry in /etc/hosts derived from dhcp
- sed -i '/127.0.1.1/d' /etc/hosts
+ sed -i '/127.0.1.1/d' /etc/hosts
#fix_nameserver FIXME needed after veewee finishes
}
@@ -112,7 +111,7 @@ configure_apache2() {
cp /etc/apache2/sites-available/default-ssl /etc/apache2/sites-available/default-ssl.orig
}
-services() {
+configure_services() {
mkdir -p /var/www/html
mkdir -p /opt/cloud/bin
mkdir -p /var/cache/cloud
@@ -121,12 +120,12 @@ services() {
mkdir -p /root/.ssh
#Fix haproxy directory issue
mkdir -p /var/lib/haproxy
-
- wget 'https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=patches/systemvm/debian/config/etc/init.d/cloud-early-config;hb=HEAD' -O /etc/init.d/cloud-early-config
+
+ wget 'https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=patches/systemvm/debian/config/etc/init.d/cloud-early-config;hb=HEAD' -O /etc/init.d/cloud-early-config
chkconfig --add cloud-early-config
chkconfig cloud-early-config on
wget 'https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr;hb=HEAD' -O /etc/init.d/cloud-passwd-srvr
- chkconfig --add cloud-passwd-srvr
+ chkconfig --add cloud-passwd-srvr
chkconfig cloud-passwd-srvr off
wget 'https://git-wip-us.apache.org/repos/asf?p=incubator-cloudstack.git;a=blob_plain;f=patches/systemvm/debian/config/etc/init.d/cloud;hb=HEAD' -O /etc/init.d/cloud
chkconfig --add cloud
@@ -135,18 +134,25 @@ services() {
chkconfig xl2tpd off
}
-signature() {
+do_signature() {
mkdir -p /var/cache/cloud/
touch /var/cache/cloud/cloud-scripts-signature
#FIXME: signature should be generated from scripts package that can get updated
echo "Cloudstack Release $CLOUDSTACK_RELEASE $(date)" > /etc/cloudstack-release
}
+begin=$(date +%s)
+
echo "*************INSTALLING PACKAGES********************"
install_packages
echo "*************DONE INSTALLING PACKAGES********************"
-accounts
-do_fixes
+setup_accounts
configure_apache2
-services
-signature
+configure_services
+do_fixes
+do_signature
+
+fin=$(date +%s)
+t=$((fin-begin))
+
+echo "Finished building systemvm appliance in $t seconds"