From 6bc7ae971a32b1ca6ce5332224de4023e1e6704c Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sun, 23 Mar 2014 10:58:50 -0400
Subject: [PATCH] Mirror fix
---
.gitignore | 3 ++-
.gopmfile | 1 +
conf/app.ini | 2 --
modules/base/conf.go | 4 +---
.../img/{avatar/default.jpg => avatar_default.jpg} | Bin
routers/admin/admin.go | 1 -
templates/admin/config.tmpl | 1 -
web.go | 2 +-
8 files changed, 5 insertions(+), 9 deletions(-)
rename public/img/{avatar/default.jpg => avatar_default.jpg} (100%)
diff --git a/.gitignore b/.gitignore
index d201223ef9..425f227c1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ custom/
data/
.vendor/
.idea/
-*.iml
\ No newline at end of file
+*.iml
+public/img/avatar/
\ No newline at end of file
diff --git a/.gopmfile b/.gopmfile
index 6e6b59c620..bd641a17cb 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -8,6 +8,7 @@ github.com/Unknwon/com=
github.com/Unknwon/cae=
github.com/Unknwon/goconfig=
github.com/dchest/scrypt=
+github.com/nfnt/resize=
github.com/lunny/xorm=
github.com/gogits/logs=
github.com/gogits/binding=
diff --git a/conf/app.ini b/conf/app.ini
index ab9f6dc4bb..ee44dd408e 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -105,8 +105,6 @@ SESSION_ID_HASHKEY =
[picture]
; The place to picture data, either "server" or "qiniu", default is "server"
SERVICE = server
-; For "server" only, root path of picture data, default is "data/pictures"
-PATH = data/pictures
[log]
; Either "console", "file", "conn", "smtp" or "database", default is "console"
diff --git a/modules/base/conf.go b/modules/base/conf.go
index fba05e8800..b243a6ad58 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -58,8 +58,7 @@ var (
SessionConfig *session.Config
SessionManager *session.Manager
- PictureService string
- PictureRootPath string
+ PictureService string
)
var Service struct {
@@ -269,7 +268,6 @@ func NewConfigContext() {
CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
PictureService = Cfg.MustValue("picture", "SERVICE")
- PictureRootPath = Cfg.MustValue("picture", "PATH")
// Determine and create root git reposiroty path.
RepoRootPath = Cfg.MustValue("repository", "ROOT")
diff --git a/public/img/avatar/default.jpg b/public/img/avatar_default.jpg
similarity index 100%
rename from public/img/avatar/default.jpg
rename to public/img/avatar_default.jpg
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index f1f951ef25..0b5e3d8e7d 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -161,7 +161,6 @@ func Config(ctx *middleware.Context) {
ctx.Data["SessionConfig"] = base.SessionConfig
ctx.Data["PictureService"] = base.PictureService
- ctx.Data["PictureRootPath"] = base.PictureRootPath
ctx.Data["LogMode"] = base.LogMode
ctx.Data["LogConfig"] = base.LogConfig
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 915c9dc088..d33a07cc3f 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -104,7 +104,6 @@
<div class="panel-body">
<div><b>Picture Service:</b> {{.PictureService}}</div>
- <div><b>Picture Root Path:</b> {{.PictureRootPath}}</div>
</div>
</div>
diff --git a/web.go b/web.go
index d055c3940e..4b7d4ef035 100644
--- a/web.go
+++ b/web.go
@@ -94,7 +94,7 @@ func runWeb(*cli.Context) {
m.Get("/stars", reqSignIn, user.Stars)
m.Get("/help", routers.Help)
- avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar/default.jpg")
+ avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar_default.jpg")
m.Get("/avatar/:hash", avatarCache.ServeHTTP)
m.Group("/user", func(r martini.Router) {