chinaphp · February 19, 2023 05:27 · Oct 21, 2022 · Oct 21, 2022 · Oct 21, 2022 · Sep 22, 2022
diff --git a/backup_gitea b/backup_gitea
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 
 if [ -z ${GITEA_DIR} ]; then
     echo Variable GITEA_DIR is not specified
@@ -18,10 +18,9 @@ set -o pipefail
 tar c -z \
   -f $BACKUP \
   -g snapshot \
-  ${GITEA_DIR} 
-2>&1 >/dev/null | \
-tee log || {
-  echo Fail to backup latest tar file | tee log
+  ${GITEA_DIR} \
+  2>>log >/dev/null || {
+  echo Fail to backup latest tar file | tee -a log
   exit 1
 }
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - 80:80
 
   gitea:
-    image: gitea/gitea:1.16.5
+    image: gitea/gitea:1.17.2
     container_name: gitea
     env_file: .env
     environment:

diff --git a/backup_gitea b/backup_gitea
@@ -1,6 +1,4 @@
-#! /bin/sh
-
-set -x
+#! /bin/bash
 
 if [ -z ${GITEA_DIR} ]; then
     echo Variable GITEA_DIR is not specified
@@ -14,16 +12,16 @@ date >>log
 
 [ -e snapshot ] && touch snapshot
 
+# If tar fails, go to code block
+set -o pipefail
+
 tar c -z \
   -f $BACKUP \
   -g snapshot \
-  --exclude="${GITEA_DIR}/ssh/*" \
-  --exclude="${GITEA_DIR}/gitea/sessions/*" \
-  --exclude="${GITEA_DIR}/gitea/indexers/*" \
-  ${GITEA_DIR} \
-  2>>log \
-  || {
-  echo Fail to backup latest tar file >>log
+  ${GITEA_DIR} 
+2>&1 >/dev/null | \
+tee log || {
+  echo Fail to backup latest tar file | tee log
   exit 1
 }
 

diff --git a/Makefile b/Makefile
@@ -23,9 +23,14 @@ config:
 backup:
 	DIR=`dirname $(MAKEFILE_LIST)`
 	docker run --rm \
-	  -v $(MAKEFILE_LIST):/app \
-	  alpine:3.16.0 \
-	  sh -c 'find /app -perm 600 2>/dev/null | xargs -i chmod 666 {}'
-	GITEA_DIR=$$DIR/data $$DIR/backup_gitea
+	  --volume `pwd`:/data \
+	  --volume $$DIR:/app \
+	  --workdir /data \
+	  --env 'GITEA_DIR=/app/data' \
+	  --env USERID=`id -u` \
+	  --env GROUPID=`id -g` \
+	  --entrypoint /bin/sh \
+	  hellyna/tar:latest \
+	  -c '/app/backup_gitea && chown $$USERID:$$GROUPID *'
 clean:
 	rm --force snapshot log *tar.gz
diff --git a/backup_gitea b/backup_gitea
@@ -1,8 +1,8 @@
-#! /bin/bash
+#! /bin/sh
 
 set -x
 
-if [[ -z ${GITEA_DIR} ]]; then
+if [ -z ${GITEA_DIR} ]; then
     echo Variable GITEA_DIR is not specified
     exit 1
 fi
@@ -12,7 +12,7 @@ BACKUP=`date +%Y-%m-%d_%H`.tar.gz
 echo >>log
 date >>log
 
-[[ -e snapshot ]] && touch snapshot
+[ -e snapshot ] && touch snapshot
 
 tar c -z \
   -f $BACKUP \

diff --git a/Makefile b/Makefile
@@ -21,10 +21,11 @@ config:
 #	0 */4 * * * make backup -f /path/to/here/Makefile >cron.log
 #	0 1   1 * * mv snapshot snapshot.bak && make backup -f /path/to/here/Makefile >cron.log
 backup:
+	DIR=`dirname $(MAKEFILE_LIST)`
 	docker run --rm \
-	  -v `pwd`:/app \
+	  -v $(MAKEFILE_LIST):/app \
 	  alpine:3.16.0 \
 	  sh -c 'find /app -perm 600 2>/dev/null | xargs -i chmod 666 {}'
-	`dirname $(MAKEFILE_LIST)`/backup_gitea
+	GITEA_DIR=$$DIR/data $$DIR/backup_gitea
 clean:
 	rm --force snapshot log *tar.gz
diff --git a/backup_gitea b/backup_gitea
@@ -2,8 +2,11 @@
 
 set -x
 
-cd `dirname $0`
-GITEA_DIR=${GITEA_DIR:-data}
+if [[ -z ${GITEA_DIR} ]]; then
+    echo Variable GITEA_DIR is not specified
+    exit 1
+fi
+
 BACKUP=`date +%Y-%m-%d_%H`.tar.gz
 
 echo >>log
@@ -16,6 +19,7 @@ tar c -z \
   -g snapshot \
   --exclude="${GITEA_DIR}/ssh/*" \
   --exclude="${GITEA_DIR}/gitea/sessions/*" \
+  --exclude="${GITEA_DIR}/gitea/indexers/*" \
   ${GITEA_DIR} \
   2>>log \
   || {

diff --git a/Makefile b/Makefile
@@ -14,3 +14,17 @@ install:
 	sudo systemctl start gitea.service
 config:
 	docker-compose config
+
+# Use root to backup data
+# Example of cron jobs:
+#   HOME=~/data/gitea
+#	0 */4 * * * make backup -f /path/to/here/Makefile >cron.log
+#	0 1   1 * * mv snapshot snapshot.bak && make backup -f /path/to/here/Makefile >cron.log
+backup:
+	docker run --rm \
+	  -v `pwd`:/app \
+	  alpine:3.16.0 \
+	  sh -c 'find /app -perm 600 2>/dev/null | xargs -i chmod 666 {}'
+	`dirname $(MAKEFILE_LIST)`/backup_gitea
+clean:
+	rm --force snapshot log *tar.gz
diff --git a/backup_gitea b/backup_gitea
@@ -0,0 +1,26 @@
+#! /bin/bash
+
+set -x
+
+cd `dirname $0`
+GITEA_DIR=${GITEA_DIR:-data}
+BACKUP=`date +%Y-%m-%d_%H`.tar.gz
+
+echo >>log
+date >>log
+
+[[ -e snapshot ]] && touch snapshot
+
+tar c -z \
+  -f $BACKUP \
+  -g snapshot \
+  --exclude="${GITEA_DIR}/ssh/*" \
+  --exclude="${GITEA_DIR}/gitea/sessions/*" \
+  ${GITEA_DIR} \
+  2>>log \
+  || {
+  echo Fail to backup latest tar file >>log
+  exit 1
+}
+
+echo Succesfully backup >>log
diff --git a/app.ini.template b/app.ini.template
@@ -31,3 +31,6 @@ HOST           =
 IS_TLS_ENABLED = true
 USER           = 
 PASSWD         = 
+
+[service]
+ENABLE_NOTIFY_MAIL = true
diff --git a/app.ini.template b/app.ini.template
@@ -22,3 +22,12 @@ START_SSH_SERVER = true
 SSH_PORT         = 2222
 SSH_LISTEN_PORT  = 2222
 OFFLINE_MODE     = false
+
+[mailer]
+ENABLED        = true
+FROM           = 
+MAILER_TYPE    = smtp
+HOST           = 
+IS_TLS_ENABLED = true
+USER           = 
+PASSWD         = 
diff --git a/nginx.conf b/nginx.conf
@@ -14,7 +14,7 @@ http {
         listen 80;
         server_name localhost station.topo.tw;
         charset utf-8;
-        client_max_body_size 200m;
+        client_max_body_size 300m;
 
         location /gitea/ {
             proxy_pass http://gitea/;

diff --git a/Makefile b/Makefile
@@ -2,12 +2,15 @@
 
 SHELL := bash
 
+export USER_UID := $(shell id -u)
+export USER_GID := $(shell getent group gitea | cut -d: -f3)
+
 all:
-	GID=`getent group gitea | cut -d: -f3` \
 	docker-compose up -d
 down:
-	GID=`getent group gitea | cut -d: -f3` \
 	docker-compose down
 install:
 	sudo systemctl enable `pwd`/gitea.service
 	sudo systemctl start gitea.service
+config:
+	docker-compose config
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,8 +15,10 @@ services:
   gitea:
     image: gitea/gitea:1.16.5
     container_name: gitea
-    user: 0:${GID}
     env_file: .env
+    environment:
+      - USER_UID
+      - USER_GID
     volumes:
       - ${GITEA_DATA_DIR}:/data
     ports:

diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 .ONESHELL:
 
+SHELL := bash
+
 all:
 	GID=`getent group gitea | cut -d: -f3` \
 	docker-compose up -d

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - /etc/passwd:/etc/passwd:ro 
       - /etc/group:/etc/group:ro
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
-      - /wk171/pham/doc:/doc
+      - ${DOC_DIR}:/doc
     ports:
       - 80:80
 

diff --git a/nginx.conf b/nginx.conf
@@ -26,6 +26,7 @@ http {
         }
 
         location /doc/ {
+            autoindex on;
             alias /doc/;
         }
     }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,8 @@ services:
     image: nginx:alpine
     container_name: nginx
     volumes:
+      - /etc/passwd:/etc/passwd:ro 
+      - /etc/group:/etc/group:ro
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
       - /wk171/pham/doc:/doc
     ports:

diff --git a/nginx.conf b/nginx.conf
@@ -1,7 +1,7 @@
 worker_processes 1;
+user root root;
 
 events { worker_connections 1024; }
-
 http {
 
     sendfile on;
@@ -25,11 +25,8 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /doc/docker/ {
-            alias /doc/docker/;
-        }
-        location /doc/git {
-            alias /doc/git/;
+        location /doc/ {
+            alias /doc/;
         }
     }
 }
diff --git a/Makefile b/Makefile
@@ -7,5 +7,5 @@ down:
 	GID=`getent group gitea | cut -d: -f3` \
 	docker-compose down
 install:
-	sudo systemctl enable gitea.service
+	sudo systemctl enable `pwd`/gitea.service
 	sudo systemctl start gitea.service
diff --git a/install b/install
@@ -1,2 +0,0 @@
-sudo systemctl enable gitea.service
-sudo systemctl start gitea.service

diff --git a/Makefile b/Makefile
@@ -6,3 +6,6 @@ all:
 down:
 	GID=`getent group gitea | cut -d: -f3` \
 	docker-compose down
+install:
+	sudo systemctl enable gitea.service
+	sudo systemctl start gitea.service
diff --git a/gitea.service b/gitea.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Gitea Server with docker
+After=docker.service
+
+[Service]
+WorkingDirectory=/wk171/gitea
+ExecStart=/usr/local/bin/docker-compose up
+ExecStop=/usr/local/bin/docker-compose down
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/install b/install
@@ -0,0 +1,2 @@
+sudo systemctl enable gitea.service
+sudo systemctl start gitea.service
diff --git a/Makefile b/Makefile
@@ -0,0 +1,8 @@
+.ONESHELL:
+
+all:
+	GID=`getent group gitea | cut -d: -f3` \
+	docker-compose up -d
+down:
+	GID=`getent group gitea | cut -d: -f3` \
+	docker-compose down
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
   gitea:
     image: gitea/gitea:1.16.5
     container_name: gitea
+    user: 0:${GID}
     env_file: .env
     volumes:
       - ${GITEA_DATA_DIR}:/data

diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .env
+data/
diff --git a/app.ini.template b/app.ini.template
@@ -0,0 +1,24 @@
+APP_NAME = Gitea
+RUN_MODE = prod
+RUN_USER = git
+
+[repository]
+ROOT = /data/git/repositories
+
+[repository.local]
+LOCAL_COPY_PATH = /data/gitea/tmp/local-repo
+
+[repository.upload]
+TEMP_PATH = /data/gitea/uploads
+
+[server]
+APP_DATA_PATH    = /data/gitea
+DOMAIN           = 0.0.0.0
+SSH_DOMAIN       = 0.0.0.0
+HTTP_PORT        = 3000
+ROOT_URL         = http://0.0.0.0/gitea/
+DISABLE_SSH      = false
+START_SSH_SERVER = true
+SSH_PORT         = 2222
+SSH_LISTEN_PORT  = 2222
+OFFLINE_MODE     = false
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - 80:80
 
   gitea:
-    image: gitea/gitea:latest
+    image: gitea/gitea:1.16.5
     container_name: gitea
     env_file: .env
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,6 +16,8 @@ services:
     env_file: .env
     volumes:
       - ${GITEA_DATA_DIR}:/data
+    ports:
+      - 2222:2222
 
 networks:
   default:

diff --git a/.env.template b/.env.template
@@ -0,0 +1 @@
+GITEA_DATA_DIR=/tmp/gitea
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,8 +13,9 @@ services:
   gitea:
     image: gitea/gitea:latest
     container_name: gitea
+    env_file: .env
     volumes:
-      - /wk171/pham/gitea:/data
+      - ${GITEA_DATA_DIR}:/data
 
 networks:
   default:

diff --git a/nginx.conf b/nginx.conf
@@ -12,7 +12,9 @@ http {
 
     server {
         listen 80;
+        server_name localhost station.topo.tw;
         charset utf-8;
+        client_max_body_size 200m;
 
         location /gitea/ {
             proxy_pass http://gitea/;

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     container_name: nginx
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
-      - /wk171/pham/docker:/doc
+      - /wk171/pham/doc:/doc
     ports:
       - 80:80
 

diff --git a/nginx.conf b/nginx.conf
@@ -23,8 +23,11 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /doc {
-            alias /doc/;
+        location /doc/docker/ {
+            alias /doc/docker/;
+        }
+        location /doc/git {
+            alias /doc/git/;
         }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,14 +6,15 @@ services:
     container_name: nginx
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - /wk171/pham/docker:/doc
     ports:
       - 80:80
 
   gitea:
     image: gitea/gitea:latest
     container_name: gitea
     volumes:
-      - /var/lib/gitea:/data
+      - /wk171/pham/gitea:/data
 
 networks:
   default:

diff --git a/nginx.conf b/nginx.conf
@@ -10,26 +10,21 @@ http {
         server gitea:3000;
     }
 
-   # map $http_upgrade $connection_upgrade {
-   #     default upgrade;
-   #     ''      close;
-   # }
-
     server {
         listen 80;
+        charset utf-8;
 
-        location / {
-            proxy_pass http://gitea;
+        location /gitea/ {
+            proxy_pass http://gitea/;
 
             proxy_redirect   off;
-            #proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host:$server_port;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
+        }
 
-            # websocket headers
-            #proxy_set_header Upgrade $http_upgrade;
-            #proxy_set_header Connection $connection_upgrade;
+        location /doc {
+            alias /doc/;
         }
     }
 }
diff --git a/nginx.conf b/nginx.conf
@@ -10,10 +10,10 @@ http {
         server gitea:3000;
     }
 
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
+   # map $http_upgrade $connection_upgrade {
+   #     default upgrade;
+   #     ''      close;
+   # }
 
     server {
         listen 80;
@@ -22,14 +22,14 @@ http {
             proxy_pass http://gitea;
 
             proxy_redirect   off;
-            proxy_set_header X-Real-IP $remote_addr;
+            #proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host:$server_port;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
 
             # websocket headers
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
+            #proxy_set_header Upgrade $http_upgrade;
+            #proxy_set_header Connection $connection_upgrade;
         }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,8 +3,9 @@ services:
 
   nginx:
     image: nginx:alpine
+    container_name: nginx
     volumes:
-      - "./nginx.conf:/etc/nginx/nginx.conf:ro"
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
     ports:
       - 80:80
 
@@ -14,5 +15,6 @@ services:
     volumes:
       - /var/lib/gitea:/data
 
-volumes:
-  data:
+networks:
+  default:
+    name: gitea
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: "3.7"
+services:
+
+  nginx:
+    image: nginx:alpine
+    volumes:
+      - "./nginx.conf:/etc/nginx/nginx.conf:ro"
+    ports:
+      - 80:80
+
+  gitea:
+    image: gitea/gitea:latest
+    container_name: gitea
+    volumes:
+      - /var/lib/gitea:/data
+
+volumes:
+  data:
diff --git a/nginx.conf b/nginx.conf
@@ -0,0 +1,35 @@
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+
+    sendfile on;
+
+    upstream gitea {
+        server gitea:3000;
+    }
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    server {
+        listen 80;
+
+        location / {
+            proxy_pass http://gitea;
+
+            proxy_redirect   off;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host:$server_port;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+
+            # websocket headers
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+        }
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		sudo systemctl enable gitea.service
		sudo systemctl start gitea.service
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		sudo systemctl enable gitea.service
		sudo systemctl start gitea.service