From dd70375832b99b625d83fc801fb4d74f9547b6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Sun, 11 Jun 2023 22:18:51 +0900
Subject: [PATCH] .

---
 Makefile            |  4 ++++
 cmd/gitlin/env.go   |  2 --
 cmd/gitlin/setup.go | 10 +---------
 serve/serve.go      | 16 ++++++----------
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 1c5bc56..e30719d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,11 +32,15 @@ dist: clean
 	rm -rf ${NAME}-${VERSION}
 
 install:
+	mkdir -p ${DESTDIR}/var/${NAME}
+	chmod 755 ${DESTDIR}/var/${NAME}
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	cp -f ${NAME} ${DESTDIR}${PREFIX}/bin
 	chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}
 	mkdir -p ${DESTDIR}${CNFPREFIX}/${NAME}
 	chmod 755 ${DESTDIR}${CNFPREFIX}/${NAME}
+	touch ${DESTDIR}${CNFPREFIX}/${NAME}/${NAME}.conf
+	chmod 644 ${DESTDIR}${CNFPREFIX}/${NAME}/${NAME}.conf
 
 uninstall:
 	rm -f ${DESTDIOR}${PREFIX}/bin/${NAME}\
diff --git a/cmd/gitlin/env.go b/cmd/gitlin/env.go
index cb6cb08..0572be6 100644
--- a/cmd/gitlin/env.go
+++ b/cmd/gitlin/env.go
@@ -41,6 +41,4 @@ func env() {
   fmt.Println("ISP/Hosting provider: " + os.Getenv("GITLIN_INSTANCE_PROVIDER"))
   // Cloudflare status
   fmt.Println("Cloudflare status: " + os.Getenv("GITLIN_INSTANCE_CLOUDFLARE"))
-  // viewsのルートフォルダ
-  fmt.Println("viewsのルートフォルダ: " + os.Getenv("GITLIN_VIEWS_ROOT"))
 }
diff --git a/cmd/gitlin/setup.go b/cmd/gitlin/setup.go
index ffab445..c6d3a68 100644
--- a/cmd/gitlin/setup.go
+++ b/cmd/gitlin/setup.go
@@ -23,7 +23,7 @@ func init() {
 
 type Vars struct {
   IPLogging, URLLogging, UserAgentLogging, DiagnosticLogging bool
-  PrivacyPolicy, InstanceCountry, InstanceProvider, CloudflareStatus, Proxying, ViewsRoot string
+  PrivacyPolicy, InstanceCountry, InstanceProvider, CloudflareStatus, Proxying string
 }
 
 func setup() {
@@ -140,13 +140,6 @@ func setup() {
     vars.Proxying = "false"
   }
 
-  fmt.Print("viewsのルートフォルダはどちらですか？ (デフォルト： /var/www/htdocs/gitlin/views )")
-  var viewdir string
-  fmt.Scanln(&viewdir)
-  if viewdir == "" {
-    vars.ViewsRoot = "/var/www/htdocs/gitlin/views"
-  }
-
   // save to gitlin.conf file
   fmt.Println("Saving environment variables to config file...")
   f, err := os.Create("/etc/gitlin/gitlin.conf")
@@ -169,7 +162,6 @@ func setup() {
   f.WriteString("GITLIN_INSTANCE_PROVIDER=" + vars.InstanceProvider + "\n")
   f.WriteString("GITLIN_INSTANCE_CLOUDFLARE=" + vars.CloudflareStatus + "\n")
   f.WriteString("GITLIN_PROXYING_ENABLED=" + vars.Proxying + "\n")
-  f.WriteString("GITLIN_VIEWS_ROOT=" + vars.ViewsRoot + "\n")
 
   println("All done! You can now start your Gitlin instance with 'gitlin serve'.")
   println("You can review the environment variables with 'gitlin env'.")
diff --git a/serve/serve.go b/serve/serve.go
index 6358a9c..990e961 100644
--- a/serve/serve.go
+++ b/serve/serve.go
@@ -22,11 +22,7 @@ import (
 
 func Serve(port string) {
   utils.LoadCnf()
-  viewsroot, ok := os.LookupEnv("GITLIN_VIEWS_ROOT")
-  if !ok {
-    log.Fatal("viewsのルートフォルダがないようです")
-  }
-  engine := html.New(viewsroot, ".html")
+  engine := html.New("/var/gitlin/views", ".html")
 
   engine.AddFunc(
     // Add unescape function. This is needed to render HTML from Markdown.
@@ -114,11 +110,11 @@ func Serve(port string) {
   })
 
   app.Get("/", pages.HandleIndex)
-  app.Static("/css", "./public/css", staticConfig)
-  app.Static("/robots.txt", "./public/robots.txt", staticConfig)
-  app.Static("/favicon.ico", "./public/assets/favicon.ico", staticConfig)
-  app.Static("/logo.png", "./public/assets/logo.png", staticConfig)
-  app.Static("/git.png", "./public/assets/git.png", staticConfig)
+  app.Static("/css", "/var/gitlin/public/css", staticConfig)
+  app.Static("/robots.txt", "/var/gitlin/public/robots.txt", staticConfig)
+  app.Static("/favicon.ico", "/var/gitlin/public/assets/favicon.ico", staticConfig)
+  app.Static("/logo.png", "/var/gitlin/public/assets/logo.png", staticConfig)
+  app.Static("/git.png", "/var/gitlin/public/assets/git.png", staticConfig)
   app.Get("/about", pages.HandleAbout)
   app.Get("/explore", ratelimiter, pages.HandleExplore)
   app.Get("/:user", pages.HandleUser)