diff --git a/install/cobbler.sh b/install/cobbler.sh index 99b46c4b..d3c13618 100755 --- a/install/cobbler.sh +++ b/install/cobbler.sh @@ -164,6 +164,11 @@ mkdir -p /var/log/cobbler/tasks mkdir -p /var/log/cobbler/anamon chmod -R 777 /var/log/cobbler +# kill dnsmasq service +chkconfig dnsmasq off +service dnsmasq stop +killall -9 dnsmasq + sudo service httpd restart sudo service cobblerd restart sudo cobbler get-loaders diff --git a/install/compass_web.sh b/install/compass_web.sh index 52165aec..17554ce1 100755 --- a/install/compass_web.sh +++ b/install/compass_web.sh @@ -25,15 +25,15 @@ if [[ $LOCAL_REPO = "y" ]]; then download -u "${LOCAL_REPO_US}/cirros-0.3.2-x86_64-disk.img" -u "${LOCAL_REPO_HUAWEI}/cirros-0.3.2-x86_64-disk.img" cirros-0.3.2-x86_64-disk.img copy /var/www/compass_web/v2 || exit $? if [[ $SUPPORT_CENTOS_6_5 = "y" ]]; then mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/6.5 - download -u "${LOCAL_REPO_US}/centos/6.5/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.5/centos_repo.tag.gz" CentOS-6.5-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.5 || exit $? + download -u "${LOCAL_REPO_US}/centos/6.5/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.5/centos_repo.tar.gz" CentOS-6.5-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.5 || exit $? fi if [[ $SUPPORT_CENTOS_6_6 = "y" ]]; then mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/6.6 - download -u "${LOCAL_REPO_US}/centos/6.6/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.6/centos_repo.tag.gz" CentOS-6.6-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.6 || exit $? + download -u "${LOCAL_REPO_US}/centos/6.6/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/6.6/centos_repo.tar.gz" CentOS-6.6-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/6.6 || exit $? fi if [[ $SUPPORT_CENTOS_7_0 = "y" ]]; then mkdir -p /var/www/compass_web/v2/yum.repos.d/centos/7.0 - download -u "${LOCAL_REPO_US}/centos/7.0/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/7.0/centos_repo.tag.gz" CentOS-7.0-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/7.0 || exit $? + download -u "${LOCAL_REPO_US}/centos/7.0/centos_repo.tar.gz" -u "${LOCAL_REPO_HUAWEI}/centos/7.0/centos_repo.tar.gz" CentOS-7.0-x86_64.tar.gz unzip /var/www/compass_web/v2/yum.repos.d/centos/7.0 || exit $? fi if [[ $SUPPORT_UBUNTU_12_04 = "y" ]]; then mkdir -p /var/www/compass_web/v2/apt.repos.d/ubuntu/12.04 diff --git a/install/dependency.sh b/install/dependency.sh index 62daddb5..10018601 100755 --- a/install/dependency.sh +++ b/install/dependency.sh @@ -52,3 +52,4 @@ sudo chkconfig redis on sudo chkconfig mysqld on sudo chkconfig iptables off sudo chkconfig ip6tables off +sudo chkconfig dnsmasq off diff --git a/install/prepare.sh b/install/prepare.sh index 3b642873..734deffc 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -90,19 +90,19 @@ fi mkdir -p /var/log/httpd chmod -R 777 /var/log/httpd -mkdir -p /var/log/mysql -chmod -R 777 /var/log/mysql sudo service httpd restart sudo service httpd status if [[ "$?" != "0" ]]; then - echo "squid is not started" + echo "httpd is not started" exit 1 else - echo "squid conf is updated" + echo "httpd conf is updated" fi #update mysqld echo "update mysqld" +mkdir -p /var/log/mysql +chmod -R 777 /var/log/mysql sudo service mysqld restart sudo service mysqld status if [[ "$?" != "0" ]]; then