Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
timdream committed Mar 1, 2010
1 parent 36fe5dd commit eb4a028
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
5 changes: 1 addition & 4 deletions README
Expand Up @@ -41,7 +41,4 @@
* apache2 package changed virtual host setting from <VirtualHost *> to
<VirtualHost *:80> after version 2.2.9-8. Do modify mkvhost.sh accordingly
BEFORE creating virtual hosts.

* "read" is broken in these scripts.

====

5 changes: 3 additions & 2 deletions lnvhost.sh
@@ -1,3 +1,5 @@
#!/bin/bash

if [ `whoami` != root ]; then
echo 'Error: root only.'
exit 1;
Expand Down Expand Up @@ -38,8 +40,7 @@ Your configration:
To remove generated site, run rmvhost.sh.
Press Ctrl+C to escape if incorrect.'
read -p 'Enter to continue. <Enter or Ctrl+C>
'
read -p 'Enter to continue. <Enter or Ctrl+C>'

sudo ln -s $1/vhost.conf /etc/apache2/sites-available/$2
sudo ln -s $1/vhost-redirect.conf /etc/apache2/sites-available/$2-redirect
Expand Down
5 changes: 3 additions & 2 deletions mkvhost.sh
@@ -1,3 +1,5 @@
#!/bin/bash

DIR=$1
SHORTNAME=$2
FQDN=$3
Expand Down Expand Up @@ -58,8 +60,7 @@ if [ -e $DIR/awstats.conf ] || \
fi

echo 'Press Ctrl+C to escape if incorrect.'
read -p 'Enter to continue. <Enter or Ctrl+C>
'
read -p 'Enter to continue. <Enter or Ctrl+C>'

echo '* mkdir dir ...'

Expand Down
5 changes: 3 additions & 2 deletions rmvhost.sh
@@ -1,3 +1,5 @@
#!/bin/bash

if [ `whoami` != root ]; then
echo 'Error: root only.'
exit 1;
Expand Down Expand Up @@ -50,8 +52,7 @@ To remove the site completely, rm -R '$1'
after running this script.
Press Ctrl+C to escape if incorrect.'
read -p 'Enter to continue. <Enter or Ctrl+C>
'
read -p 'Enter to continue. <Enter or Ctrl+C>'

sudo a2dissite $2 > /dev/null
sudo a2dissite $2-redirect > /dev/null
Expand Down

0 comments on commit eb4a028

Please sign in to comment.