فهرست منبع

Added UsercontentURL

Yoginth 7 سال پیش
والد
کامیت
7077d0613d
6فایلهای تغییر یافته به همراه8 افزوده شده و 11 حذف شده
  1. 2 0
      gitote.go
  2. 1 1
      models/user.go
  3. 1 0
      pkg/form/user.go
  4. 1 0
      pkg/setting/setting.go
  5. 3 0
      pkg/template/template.go
  6. 0 10
      script/conf/prod

+ 2 - 0
gitote.go

@@ -38,6 +38,8 @@ func init() {
 	raven.SetDSN("https://c711d9b100e74dfeb5fdee84a4d6c273:ff5ccef0870a48aea106d89b67a69710@sentry.io/1268720")
 	setting.AppVer = AppVer
 	setting.APIVer = APIVer
+	setting.AppURL = "https://gitote.in"
+	setting.UsercontentURL = "https://gitoteusercontent.gitote.in"
 }
 
 func main() {

+ 1 - 1
models/user.go

@@ -329,7 +329,7 @@ func (u *User) RelAvatarLink() string {
 func (u *User) AvatarLink() string {
 	link := u.RelAvatarLink()
 	if link[0] == '/' && link[1] != '/' {
-		return setting.AppURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
+		return setting.UsercontentURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
 	}
 	return link
 }

+ 1 - 0
pkg/form/user.go

@@ -29,6 +29,7 @@ type Install struct {
 	UseBuiltinSSHServer bool
 	HTTPPort            string `binding:"Required"`
 	AppUrl              string `binding:"Required"`
+	UsercontentURL      string `binding:"Required"`
 	LogRootPath         string `binding:"Required"`
 	EnableConsoleMode   bool
 

+ 1 - 0
pkg/setting/setting.go

@@ -58,6 +58,7 @@ var (
 	AppVer         string
 	APIVer         string
 	AppURL         string
+	UsercontentURL string
 	AppSubURL      string
 	AppSubURLDepth int // Number of slashes
 	AppPath        string

+ 3 - 0
pkg/template/template.go

@@ -44,6 +44,9 @@ func NewFuncMap() []template.FuncMap {
 		"AppURL": func() string {
 			return setting.AppURL
 		},
+		"UsercontentURL": func() string {
+			return setting.UsercontentURL
+		},
 		"AppVer": func() string {
 			return setting.AppVer
 		},

+ 0 - 10
script/conf/prod

@@ -29,16 +29,6 @@ server {
 
 }
 
-server {
-  listen 80;
-  server_name cdn.gitote.in;
-
-  location / {
-    expires 90d;
-    root /root/cdn;
-  }
-}
-
 server {
     if ($host = gitote.in) {
         return 301 https://$host$request_uri;