Compare commits
3 Commits
4dd0661e1e
...
f622cba366
Author | SHA1 | Date | |
---|---|---|---|
f622cba366 | |||
e86660d34e | |||
cfb07a6e93 |
@@ -8,7 +8,7 @@ FROM debian:bookworm-slim
|
||||
RUN apt-get update && apt-get install -y git hugo nginx cron curl bash sudo htop
|
||||
|
||||
# User and Group
|
||||
RUN groupadd -r hugo && useradd -r -g hugo hugo
|
||||
#RUN groupadd -r hugo && useradd -r -g hugo hugo
|
||||
|
||||
# Hugo Directory Tree
|
||||
RUN mkdir -pv /var/www/hugo/
|
||||
@@ -17,12 +17,11 @@ RUN mkdir -pv /var/www/hugo/
|
||||
RUN mkdir -pv /var/www/html/
|
||||
|
||||
# Copy Cron Job to Update Git Repo
|
||||
COPY files/hugo.crontab /etc/cron.d/hugo
|
||||
COPY files/hugo.crontab /etc/crontab
|
||||
COPY files/hugo.cronjob.sh /var/www/hugo/cronjob.sh
|
||||
RUN crontab /etc/cron.d/hugo
|
||||
|
||||
# Hugo User Permissions
|
||||
RUN chown -Rv hugo:hugo /var/www/
|
||||
RUN chown -Rv www-data:www-data /var/www/
|
||||
RUN chmod +x /var/www/hugo/cronjob.sh
|
||||
|
||||
# Copy Start Script
|
||||
|
@@ -1 +1 @@
|
||||
* * * * * hugo /var/www/hugo/cronjob.sh
|
||||
* * * * * www-data /var/www/hugo/cronjob.sh
|
||||
|
@@ -12,7 +12,7 @@ typeset -u DEV
|
||||
echo "DEV=$DEV"
|
||||
|
||||
echo "*** Creating Git Repo ***"
|
||||
sudo -u hugo git clone --recurse-submodules $REPO /var/www/hugo/site
|
||||
sudo -u www-data git clone --recurse-submodules $REPO /var/www/hugo/site
|
||||
status="$?"
|
||||
|
||||
echo "*** Validating Git Repo ***"
|
||||
@@ -25,7 +25,7 @@ echo "* Site exists!"
|
||||
|
||||
echo "*** Copying Static Files to NGINX ***"
|
||||
rm -rfv /var/www/html/*
|
||||
sudo -u hugo /var/www/hugo/cronjob.sh
|
||||
sudo -u www-data /var/www/hugo/cronjob.sh
|
||||
|
||||
echo "*** Starting Cron ***"
|
||||
service cron start
|
||||
@@ -58,12 +58,20 @@ if [[ "$DEV" == "Y"* || "$DEV" == "T"* ]]; then
|
||||
echo "* Dev server not detected, starting..."
|
||||
cd /var/www/hugo/site
|
||||
killall hugo 2>/dev/null
|
||||
sudo -u hugo hugo server -D --noBuildLock --bind 0.0.0.0 -p 1380 &
|
||||
sudo -u www-data hugo server -D --noBuildLock --bind 0.0.0.0 -p 1380 &
|
||||
fi
|
||||
sleep 30
|
||||
done &
|
||||
fi
|
||||
|
||||
echo "*** Following Mail Files ***"
|
||||
cd /var/mail
|
||||
touch mail www-data
|
||||
chown -v mail:mail mail
|
||||
chown -v www-data:mail www-data
|
||||
chmod -v 660 mail www-data
|
||||
tail -f mail www-data &
|
||||
|
||||
cd
|
||||
|
||||
echo "*** Finished $0 @ `date` ***"
|
||||
|
Reference in New Issue
Block a user