Browse Source

Corrections

Lertsenem 5 years ago
parent
commit
ac7e24a314
3 changed files with 5 additions and 4 deletions
  1. 1 0
      Dockerfile
  2. 3 3
      git.post-receive
  3. 1 1
      nginx.conf

+ 1 - 0
Dockerfile

@@ -36,6 +36,7 @@ RUN    apk update                              \
36 36
     && rm -r /etc/nginx/conf.d/                \
37 37
     && ssh-keygen -A                           \
38 38
     && mkdir /srv/www                          \
39
+    && chmod 775         /srv/www              \
39 40
     && chown nginx:nginx /srv/www
40 41
 
41 42
 COPY run.sh                /run.sh

+ 3 - 3
git.post-receive

@@ -8,6 +8,6 @@ cd /srv/git
8 8
 
9 9
 cd /srv/git/build
10 10
 
11
-git pull     -f /srv/git/blog.git   >$LOGFILE
12
-git checkout -f                    >>$LOGFILE
13
-pelican content -v -o /srv/www/    >>$LOGFILE
11
+git pull     -f /srv/git/blog.git  2>&1  >$LOGFILE
12
+git checkout -f                    2>&1 >>$LOGFILE
13
+pelican content -v -o /srv/www/    2>&1 >>$LOGFILE

+ 1 - 1
nginx.conf

@@ -31,7 +31,7 @@ http {
31 31
         listen [::]:80 default_server ipv6only=on;
32 32
 
33 33
         location / {
34
-            root /var/www/;
34
+            root /srv/www/;
35 35
         }
36 36
     }
37 37
 }