Skip to content

Commit b6f034e

Browse files
committed
ubuntu 14.0.4 support
1 parent 2dec0c5 commit b6f034e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

install/vst-install-ubuntu.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ apt=/etc/apt/sources.list.d
252252
echo "deb http://nginx.org/packages/ubuntu/ $codename nginx" > $apt/nginx.list
253253
wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
254254
apt-key add /tmp/nginx_signing.key
255-
if [ $codename = 'saucy' ]; then
256-
sed -i "s/saucy/raring/g" $apt/nginx.list
255+
if [ $codename = 'trusty' ]; then
256+
sed -i "s/trusty/saucy/g" $apt/nginx.list
257257
fi
258258

259259
# Install vesta repo
@@ -450,7 +450,7 @@ fi
450450

451451
# Apache configuration
452452
wget $CHOST/$VERSION/apache2.conf -O /etc/apache2/apache2.conf
453-
if [ "$codename" = 'saucy' ]; then
453+
if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then
454454
sed -i "/^LockFile /d" /etc/apache2/apache2.conf
455455
fi
456456
wget $CHOST/$VERSION/apache2-status.conf \
@@ -608,7 +608,7 @@ fi
608608
# php configuration
609609
sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php5/apache2/php.ini
610610
sed -i "s/;date.timezone =/date.timezone = UTC/g" /etc/php5/cli/php.ini
611-
if [ "$codename" = 'saucy' ]; then
611+
if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then
612612
ln -s /etc/php5/conf.d/mcrypt.ini /etc/php5/mods-available
613613
php5enmod mcrypt
614614
service apache2 restart
@@ -634,7 +634,7 @@ mysql -e "CREATE DATABASE roundcube"
634634
mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'"
635635
sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php
636636
mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
637-
if [ "$codename" = 'saucy' ]; then
637+
if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then
638638
wget $CHOST/$VERSION/roundcube-driver-new.php -O \
639639
/usr/share/roundcube/plugins/password/drivers/vesta.php
640640
ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/
@@ -696,7 +696,7 @@ cd /usr/local/vesta/data
696696
wget $CHOST/$VERSION/templates.tar.gz -O templates.tar.gz
697697
tar -xzf templates.tar.gz
698698
rm -f templates.tar.gz
699-
if [ "$codename" = 'saucy' ]; then
699+
if [ "$codename" = 'saucy' ] || [ "$codename" = 'trusty' ]; then
700700
sed -i "s/Include /IncludeOptional /g" \
701701
$VESTA/data/templates/web/apache2/*tpl
702702
fi

0 commit comments

Comments
 (0)