Mirror fix

diff --git a/.gitignore b/.gitignore
index d201223ef9734b686072ad1b43f06162892fca57..425f227c1adc177e1beec4b50016cce6ef3b2011 100644 (file)
--- 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 6e6b59c620238670abbe13a4918c8ff57c5df1bc..bd641a17cb72d4ae36460acaecc4cfbcec25e0ac 100644 (file)
--- 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 ab9f6dc4bb55872e766495ebd17d3818b6b6bbfb..ee44dd408e915a39e270e2179114995d40abe17a 100644 (file)
--- 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 fba05e88000fcac9ccb347a1d909697ec0a7dc61..b243a6ad58a827f9eef30cacb4c937a733159bac 100644 (file)
--- 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
deleted file mode 100644 (file)
index 728ec5a..0000000
Binary files a/public/img/avatar/default.jpg and /dev/null differ

diff --git a/public/img/avatar_default.jpg b/public/img/avatar_default.jpg
new file mode 100644 (file)
index 0000000..728ec5a
Binary files /dev/null and b/public/img/avatar_default.jpg differ

diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index f1f951ef259bbc4016af2768936eb75ebf98a681..0b5e3d8e7deedf75d128d8828c1925b462566a38 100644 (file)
--- 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 915c9dc088b1ea9641255bcaea0f4f247f5f8a8f..d33a07cc3f23d6eca883166f9bce155681109c86 100644 (file)
--- 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 d055c3940e246d3cd12a5a63bbaf4f74449e9bc3..4b7d4ef0359db924080bf1b81a9418c1dc7a0a44 100644 (file)
--- 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) {