Skip to content

Commit 980d10a

Browse files
committed
Improve output
1 parent b312234 commit 980d10a

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

create.sh

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ then
1010
exit 2
1111
fi
1212
SITENAME=journey-$SITENAME
13-
mkdir -p /var/www
14-
cd /var/www
15-
echo "This will delete the folder $SITENAME! Press CTRL + C to quit, or press enter to continue!"
16-
read input
17-
mkdir $SITENAME
18-
cd $SITENAME
13+
mkdir -p /var/www/$SITENAME
14+
cd /var/www/$SITENAME
1915
echo "Getting latest release!" # TODO make this a symlink for all except config and db files
20-
wget https://github.com/kabukky/journey/releases/download/v0.1.9/journey-linux-amd64.zip
21-
unzip journey-linux-amd64.zip
16+
wget --quiet https://github.com/kabukky/journey/releases/download/v0.1.9/journey-linux-amd64.zip
17+
unzip -qq journey-linux-amd64.zip
2218
rm journey-linux-amd64.zip
2319
mv journey-linux-amd64/ journey
2420
cd journey
25-
echo "Configuring config.json"
2621
sed -i -e "s/8084/$PORT/g" config.json
2722
sed -i -e "s/127.0.0.1:$PORT/$SITEURL:$PORT/g" config.json
2823
echo "start on runlevel [2345]" >> /etc/init/$SITENAME.conf
@@ -31,7 +26,6 @@ echo "respawn" >> /etc/init/$SITENAME.conf
3126
echo "console none" >> /etc/init/$SITENAME.conf
3227
echo "exec /var/www/$SITENAME/journey/journey -log=/var/www/$SITENAME/journey/log.txt" >> /etc/init/$SITENAME.conf
3328
cd /etc/nginx/sites-enabled
34-
echo "Proxying port from 80 to $PORT"
3529
echo "server {" >> $SITENAME.conf
3630
echo "listen 0.0.0.0:80;" >> $SITENAME.conf
3731
echo "server_name $SITEURL;" >> $SITENAME.conf
@@ -53,4 +47,5 @@ service nginx restart
5347
echo "---------------------------------------------------"
5448
echo "You may need to oonfigure your DNS Records if you used a custom domain!"
5549
echo "ALL DONE! $SITEURL is viewable as a Journey blog!"
56-
echo "Setup at $SITEURL/admin"
50+
echo "Setup at $SITEURL/admin"
51+
echo "---------------------------------------------------"

pages.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ var admin = `
125125
<div class="form-group">
126126
<label class="col-md-4 control-label" for="blog">Blog Name</label>
127127
<div class="col-md-6">
128-
<input id="blogname" name="blogname" type="text" placeholder="Blog Name" class="form-control input-md" required="">
128+
<input id="blogname" name="blogname" type="text" placeholder="exampleblog" class="form-control input-md" required="">
129129
130130
</div>
131131
</div>
@@ -134,7 +134,7 @@ var admin = `
134134
<div class="form-group">
135135
<label class="col-md-4 control-label" for="website">Blog Website</label>
136136
<div class="col-md-6">
137-
<input id="blogname" name="website" type="text" placeholder="Blog Website" class="form-control input-md" required="">
137+
<input id="blogname" name="website" type="text" placeholder="example.com" class="form-control input-md" required="">
138138
139139
</div>
140140
</div>

0 commit comments

Comments
 (0)