.
このコミットが含まれているのは:
コミット
dd70375832
4
Makefile
4
Makefile
|
@ -32,11 +32,15 @@ dist: clean
|
||||||
rm -rf ${NAME}-${VERSION}
|
rm -rf ${NAME}-${VERSION}
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
mkdir -p ${DESTDIR}/var/${NAME}
|
||||||
|
chmod 755 ${DESTDIR}/var/${NAME}
|
||||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||||
cp -f ${NAME} ${DESTDIR}${PREFIX}/bin
|
cp -f ${NAME} ${DESTDIR}${PREFIX}/bin
|
||||||
chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}
|
chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}
|
||||||
mkdir -p ${DESTDIR}${CNFPREFIX}/${NAME}
|
mkdir -p ${DESTDIR}${CNFPREFIX}/${NAME}
|
||||||
chmod 755 ${DESTDIR}${CNFPREFIX}/${NAME}
|
chmod 755 ${DESTDIR}${CNFPREFIX}/${NAME}
|
||||||
|
touch ${DESTDIR}${CNFPREFIX}/${NAME}/${NAME}.conf
|
||||||
|
chmod 644 ${DESTDIR}${CNFPREFIX}/${NAME}/${NAME}.conf
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f ${DESTDIOR}${PREFIX}/bin/${NAME}\
|
rm -f ${DESTDIOR}${PREFIX}/bin/${NAME}\
|
||||||
|
|
|
@ -41,6 +41,4 @@ func env() {
|
||||||
fmt.Println("ISP/Hosting provider: " + os.Getenv("GITLIN_INSTANCE_PROVIDER"))
|
fmt.Println("ISP/Hosting provider: " + os.Getenv("GITLIN_INSTANCE_PROVIDER"))
|
||||||
// Cloudflare status
|
// Cloudflare status
|
||||||
fmt.Println("Cloudflare status: " + os.Getenv("GITLIN_INSTANCE_CLOUDFLARE"))
|
fmt.Println("Cloudflare status: " + os.Getenv("GITLIN_INSTANCE_CLOUDFLARE"))
|
||||||
// viewsのルートフォルダ
|
|
||||||
fmt.Println("viewsのルートフォルダ: " + os.Getenv("GITLIN_VIEWS_ROOT"))
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ func init() {
|
||||||
|
|
||||||
type Vars struct {
|
type Vars struct {
|
||||||
IPLogging, URLLogging, UserAgentLogging, DiagnosticLogging bool
|
IPLogging, URLLogging, UserAgentLogging, DiagnosticLogging bool
|
||||||
PrivacyPolicy, InstanceCountry, InstanceProvider, CloudflareStatus, Proxying, ViewsRoot string
|
PrivacyPolicy, InstanceCountry, InstanceProvider, CloudflareStatus, Proxying string
|
||||||
}
|
}
|
||||||
|
|
||||||
func setup() {
|
func setup() {
|
||||||
|
@ -140,13 +140,6 @@ func setup() {
|
||||||
vars.Proxying = "false"
|
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
|
// save to gitlin.conf file
|
||||||
fmt.Println("Saving environment variables to config file...")
|
fmt.Println("Saving environment variables to config file...")
|
||||||
f, err := os.Create("/etc/gitlin/gitlin.conf")
|
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_PROVIDER=" + vars.InstanceProvider + "\n")
|
||||||
f.WriteString("GITLIN_INSTANCE_CLOUDFLARE=" + vars.CloudflareStatus + "\n")
|
f.WriteString("GITLIN_INSTANCE_CLOUDFLARE=" + vars.CloudflareStatus + "\n")
|
||||||
f.WriteString("GITLIN_PROXYING_ENABLED=" + vars.Proxying + "\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("All done! You can now start your Gitlin instance with 'gitlin serve'.")
|
||||||
println("You can review the environment variables with 'gitlin env'.")
|
println("You can review the environment variables with 'gitlin env'.")
|
||||||
|
|
|
@ -22,11 +22,7 @@ import (
|
||||||
|
|
||||||
func Serve(port string) {
|
func Serve(port string) {
|
||||||
utils.LoadCnf()
|
utils.LoadCnf()
|
||||||
viewsroot, ok := os.LookupEnv("GITLIN_VIEWS_ROOT")
|
engine := html.New("/var/gitlin/views", ".html")
|
||||||
if !ok {
|
|
||||||
log.Fatal("viewsのルートフォルダがないようです")
|
|
||||||
}
|
|
||||||
engine := html.New(viewsroot, ".html")
|
|
||||||
|
|
||||||
engine.AddFunc(
|
engine.AddFunc(
|
||||||
// Add unescape function. This is needed to render HTML from Markdown.
|
// Add unescape function. This is needed to render HTML from Markdown.
|
||||||
|
@ -114,11 +110,11 @@ func Serve(port string) {
|
||||||
})
|
})
|
||||||
|
|
||||||
app.Get("/", pages.HandleIndex)
|
app.Get("/", pages.HandleIndex)
|
||||||
app.Static("/css", "./public/css", staticConfig)
|
app.Static("/css", "/var/gitlin/public/css", staticConfig)
|
||||||
app.Static("/robots.txt", "./public/robots.txt", staticConfig)
|
app.Static("/robots.txt", "/var/gitlin/public/robots.txt", staticConfig)
|
||||||
app.Static("/favicon.ico", "./public/assets/favicon.ico", staticConfig)
|
app.Static("/favicon.ico", "/var/gitlin/public/assets/favicon.ico", staticConfig)
|
||||||
app.Static("/logo.png", "./public/assets/logo.png", staticConfig)
|
app.Static("/logo.png", "/var/gitlin/public/assets/logo.png", staticConfig)
|
||||||
app.Static("/git.png", "./public/assets/git.png", staticConfig)
|
app.Static("/git.png", "/var/gitlin/public/assets/git.png", staticConfig)
|
||||||
app.Get("/about", pages.HandleAbout)
|
app.Get("/about", pages.HandleAbout)
|
||||||
app.Get("/explore", ratelimiter, pages.HandleExplore)
|
app.Get("/explore", ratelimiter, pages.HandleExplore)
|
||||||
app.Get("/:user", pages.HandleUser)
|
app.Get("/:user", pages.HandleUser)
|
||||||
|
|
読み込み中…
新しいイシューから参照