Blog app tidying
This commit is contained in:
Bob Mottram
parent
c9c9dbcb36
commit
5b43026fd4
|
|
@ -257,37 +257,16 @@ function install_blog_user {
|
|||
echo 'role = admin' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
|
||||
}
|
||||
|
||||
function install_blog {
|
||||
if [ ! $FULLBLOG_DOMAIN_NAME ]; then
|
||||
echo $'The blog domain name was not specified'
|
||||
exit 5062
|
||||
fi
|
||||
function install_blog_settings {
|
||||
cp /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini.example /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|site.url.*|site.url = '/'|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|blog.title.*|blog.title = '$MY_BLOG_TITLE'|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|blog.tagline.*|blog.tagline = '$MY_BLOG_SUBTITLE'|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i 's|timezone.*|timezone = "Europe/London"|g' /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|Your name|$MY_NAME|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
}
|
||||
|
||||
if grep -Fxq "install_blog" $COMPLETION_FILE; then
|
||||
return
|
||||
fi
|
||||
|
||||
# for the avatar changing command
|
||||
apt-get -y install imagemagick
|
||||
|
||||
if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME ]; then
|
||||
mkdir /var/www/$FULLBLOG_DOMAIN_NAME
|
||||
fi
|
||||
|
||||
cd /var/www/$FULLBLOG_DOMAIN_NAME
|
||||
git_clone $FULLBLOG_REPO htdocs
|
||||
cd htdocs
|
||||
git checkout $FULLBLOG_COMMIT -b $FULLBLOG_COMMIT
|
||||
if ! grep -q "Blog commit" $COMPLETION_FILE; then
|
||||
echo "Blog commit:$FULLBLOG_COMMIT" >> $COMPLETION_FILE
|
||||
else
|
||||
sed -i "s/Blog commit.*/Blog commit:$FULLBLOG_COMMIT/g" $COMPLETION_FILE
|
||||
fi
|
||||
cd /var/www/$FULLBLOG_DOMAIN_NAME
|
||||
|
||||
chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs
|
||||
|
||||
if [[ $ONION_ONLY == "no" ]]; then
|
||||
function install_blog_website {
|
||||
function_check nginx_http_redirect
|
||||
nginx_http_redirect $FULLBLOG_DOMAIN_NAME
|
||||
echo 'server {' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
|
|
@ -370,9 +349,9 @@ function install_blog {
|
|||
echo ' }' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
echo '}' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
echo '' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
else
|
||||
echo -n '' > /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
fi
|
||||
}
|
||||
|
||||
function install_blog_website_onion {
|
||||
echo 'server {' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
echo " listen 127.0.0.1:${FULLBLOG_ONION_PORT} default_server;" >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
echo " root /var/www/$FULLBLOG_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
|
|
@ -450,6 +429,48 @@ function install_blog {
|
|||
echo ' deny all;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
echo ' }' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
echo '}' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
}
|
||||
|
||||
function install_blog_from_repo {
|
||||
if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME ]; then
|
||||
mkdir /var/www/$FULLBLOG_DOMAIN_NAME
|
||||
fi
|
||||
|
||||
cd /var/www/$FULLBLOG_DOMAIN_NAME
|
||||
git_clone $FULLBLOG_REPO htdocs
|
||||
cd htdocs
|
||||
git checkout $FULLBLOG_COMMIT -b $FULLBLOG_COMMIT
|
||||
if ! grep -q "Blog commit" $COMPLETION_FILE; then
|
||||
echo "Blog commit:$FULLBLOG_COMMIT" >> $COMPLETION_FILE
|
||||
else
|
||||
sed -i "s/Blog commit.*/Blog commit:$FULLBLOG_COMMIT/g" $COMPLETION_FILE
|
||||
fi
|
||||
}
|
||||
|
||||
function install_blog {
|
||||
if [ ! $FULLBLOG_DOMAIN_NAME ]; then
|
||||
echo $'The blog domain name was not specified'
|
||||
exit 5062
|
||||
fi
|
||||
|
||||
if grep -Fxq "install_blog" $COMPLETION_FILE; then
|
||||
return
|
||||
fi
|
||||
|
||||
# for the avatar changing command
|
||||
apt-get -y install imagemagick
|
||||
|
||||
function_check install_blog_from_repo
|
||||
install_blog_from_repo
|
||||
|
||||
if [[ $ONION_ONLY == "no" ]]; then
|
||||
function_check install_blog_website
|
||||
install_blog_website
|
||||
else
|
||||
echo -n '' > /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
|
||||
fi
|
||||
function_check install_blog_website_onion
|
||||
install_blog_website_onion
|
||||
|
||||
function_check create_site_certificate
|
||||
create_site_certificate $FULLBLOG_DOMAIN_NAME 'yes'
|
||||
|
|
@ -457,23 +478,22 @@ function install_blog {
|
|||
function_check configure_php
|
||||
configure_php
|
||||
|
||||
# blog settings
|
||||
cp /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini.example /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|site.url.*|site.url = '/'|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|blog.title.*|blog.title = '$MY_BLOG_TITLE'|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|blog.tagline.*|blog.tagline = '$MY_BLOG_SUBTITLE'|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i 's|timezone.*|timezone = "Europe/London"|g' /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
sed -i "s|Your name|$MY_NAME|g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
||||
function_check install_blog_settings
|
||||
install_blog_settings
|
||||
|
||||
function_check install_blog_social_networks
|
||||
install_blog_social_networks
|
||||
|
||||
function_check install_blog_user
|
||||
install_blog_user
|
||||
|
||||
chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs
|
||||
|
||||
FULLBLOG_ONION_HOSTNAME=$(add_onion_service blog 80 ${FULLBLOG_ONION_PORT})
|
||||
|
||||
function_check nginx_ensite
|
||||
nginx_ensite $FULLBLOG_DOMAIN_NAME
|
||||
|
||||
FULLBLOG_ONION_HOSTNAME=$(add_onion_service blog 80 ${FULLBLOG_ONION_PORT})
|
||||
|
||||
systemctl restart php5-fpm
|
||||
systemctl restart nginx
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue