Changeset 71 in code

Timestamp:

Apr 17, 2025, 6:18:24 PM (7 weeks ago)

Author:

yakumo.izuru

Message:

今では重荷がなくなったので...

Location:

trunk

Files:

• INSTALL.md (deleted)
• INSTANCES.md (deleted)
• LEGAL.md (deleted)
• Makefile (modified) (1 diff)
• cmd/mai/main.go (modified) (7 diffs)
• cmd/mai/parseflags.go (modified) (1 diff)
• cmd/mai/readconf.go (modified) (1 diff)
• cmd/simplytranslate (deleted)
• docs (deleted)
• example/mai.apache.conf (added)
• example/mai.ini (modified) (1 diff)
• example/mai.nginx (modified) (2 diffs)
• go.mod (modified) (1 diff)
• mai.ini.5 (deleted)
• rc.d/FreeBSD (modified) (1 diff)
• rc.d/NetBSD (modified) (2 diffs)
• rc.d/OpenBSD (modified) (1 diff)
• rc.d/immortal.yml (modified) (1 diff)
• rc.d/mai.service (added)
• rc.d/mokou.conf (added)
• rc.d/s6 (added)
• static/docs (deleted)
• version.go (modified) (1 diff)
• web (deleted)

trunk/Makefile

@@ +1 @@
+GO ?= go
 PREFIX ?= /usr/local
-GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=${VERSION} -X `go list`.Commit=${COMMIT}"
-VERSION = `git describe --abbrev=0 --tags 2>/dev/null || echo "VERSION"`
-COMMIT = `git rev-parse --short HEAD || echo "COMMIT"`
+GOFLAGS ?= -v -ldflags "-w -X `${GO} list`.Version=${VERSION}"
+VERSION ?= 2025.04.17
 
 build:
-        go build ${GOFLAGS} ./cmd/mai
+        ${GO} build ${GOFLAGS} ./cmd/mai
 clean:
         rm -f mai

trunk/cmd/mai/main.go

@@ -13 +13 @@
         "syscall"
 
-        "marisa.chaotic.ninja/mai"
-        "marisa.chaotic.ninja/mai/engines"
+        "mahou-no-mori.yakumo.dev/mai"
+        "mahou-no-mori.yakumo.dev/mai/engines"
 
         "github.com/gofiber/fiber/v2"
@@ -25 +25 @@
 var (
         configfile string
-        groupname string
-        username string
+        verbose bool
 )
 var conf struct {
-        danmaku int
+        group string
         listen string
-        staticpath string
-        tmplpath string
+        requests int
+        static string
+        templates string
+        user string
 }
 func MaiSkipLimiter(c *fiber.Ctx) bool {
         // Paths listed here are not considered for rate limiting
         path := c.Path()
-        return strings.HasPrefix(path, "/static") ||
-                strings.HasPrefix(path, "/docs")
+        return strings.HasPrefix(path, "/static")
 }
 func main() {
         parseFlags()
 
+        conf.listen = "127.0.0.1:5000"
+        conf.requests = 5
+        conf.static = "./static"
+        conf.templates = "./views"
+
         if configfile != "" {
+                if verbose {
+                        log.Printf("Reading configuration from %s", configfile)
+                }
                 readConf(configfile)
         }
 
-        // Default settings
-        conf.danmaku = 10
-        conf.listen = "127.0.0.1:5000"
-        conf.staticpath = "./static"
-        conf.tmplpath = "./views"
-
-        if username != "" {
-                uid, gid, err := usergroupids(username, groupname)
+        if conf.user != "" {
+                uid, gid, err := usergroupids(conf.user, conf.group)
                 if err != nil {
                         log.Fatal(err)
@@ -62 +64 @@
         }
         
-        engine := html.New(conf.tmplpath, ".html")
+        engine := html.New(conf.templates, ".html")
         engine.AddFunc("inc", func(i int) int { return i + 1 })
 
@@ -86 +88 @@
         server.Use(favicon.New(
                 favicon.Config{
-                        File: conf.staticpath + "/favicon.ico",
+                        File: conf.static + "/favicon.ico",
                 },
         ))
@@ -101 +103 @@
         server.Use(limiter.New(limiter.Config{
                 Next: MaiSkipLimiter,
-                Max: conf.danmaku,
+                Max: conf.requests,
                 Expiration: 30 * time.Second,
                 LimiterMiddleware: limiter.SlidingWindow{},
@@ -297 +299 @@
 
         server.Get("/toomanyrequests", func(c *fiber.Ctx) error {
-                return c.SendFile(conf.tmplpath + "/429.html")
+                return c.SendFile(conf.templates + "/429.html")
                 return c.SendStatus(429)
         })
@@ -326 +328 @@
                 return c.Redirect("/")
         })
-        server.Static("/static", conf.staticpath, fiber.Static{
-                Compress: true,
+        server.Static("/static", conf.static, fiber.Static{
                 ByteRange: true,
                 Browse: true,
         })
 
-        server.Static("/docs", "./docs", fiber.Static{})
-
         server.Listen(conf.listen)
 }

trunk/cmd/mai/parseflags.go

@@ -8 +8 @@
 func parseFlags() {
         flag.StringVar(&configfile, "f", "", "Configuration file")
-        flag.StringVar(&username, "u", "", "Sets the user to which privilege dropping is done")
-        flag.StringVar(&groupname, "g", "", "Sets the group to which privilege dropping is done")
+        flag.BoolVar(&verbose, "v", false, "Be verbose")
         flag.Parse()
 }

trunk/cmd/mai/readconf.go

@@ -11 +11 @@
                 return err                                              
         }
-        conf.danmaku, _ = cfg.Section("mai").Key("danmaku").Int()
-        conf.listen = cfg.Section("mai").Key("listen").String()
-        conf.staticpath = cfg.Section("mai").Key("static").String()
-        conf.tmplpath = cfg.Section("mai").Key("templates").String()
 
+        conf.group = cfg.Section("mai").Key("group").String()
+        conf.listen = cfg.Section("http").Key("listen").String()
+        conf.requests, _ = cfg.Section("http").Key("requests").Int()
+        conf.static = cfg.Section("paths").Key("static").String()
+        conf.templates = cfg.Section("paths").Key("templates").String()
+        conf.user = cfg.Section("mai").Key("user").String()
         return nil
 }

trunk/example/mai.ini

@@ +1 @@
+[http]
+# TCP socket to listen on.
+# Must not be already used by something else.
+listen = 127.0.0.1:5000
+# How many requests per minute are allowed
+# before a rate-limit happens.
+requests = 10
 [mai]
-listen = "127.0.0.1:5000"
-rootdir = "./static"
-tmplpath = "./views"
+# Drop privilege to the user and group specified.
+# When only the user is specified, the default group of the user will
+# be used.
+#
+# user = www
+# group = www
+[paths]
+# Where to locate resources such as CSS, etc
+static = ./static
+# Where to locate the pages to be served
+templates = ./views

trunk/example/mai.nginx

@@ -2 +2 @@
     listen 80;
     listen [::]:80;
-    server_name mai.example.com;
+    server_name mai.example.org;
 
     location / {
@@ -12 +12 @@
     listen 443 ssl;
     listen [::]:443 ssl;
-    server_name mai.example.com;
+    server_name mai.example.org;
 
     ssl_certificate /path/to/fullchain.pem;

trunk/go.mod

@@ -1 @@
-module marisa.chaotic.ninja/mai
+module mahou-no-mori.yakumo.dev/mai
 
 go 1.20

trunk/rc.d/FreeBSD

@@ -1 +1 @@
 #!/bin/sh
-# $TheSupernovaDuo$
+# $YakumoLabs$
 #
 # PROVIDE: mai

trunk/rc.d/NetBSD

@@ -1 +1 @@
 #!/bin/sh
-# $TheSupernovaDuo$
+# $YakumoLabs$
 #
 # PROVIDE: mai
 # REQUIRE: NETWORKING DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
 
 $_rc_subr_loaded . /etc/rc.subr
@@ -11 +9 @@
 name="mai"
 rcvar=$name
-command="/usr/pkg/bin/mai"
-command_args="-f /usr/pkg/etc/mai/mai.ini -u www -g www"
+command="/usr/local/bin/mai"
+command_args="-f /usr/local/etc/mai/mai.ini"
 pidfile="/var/run/${name}.pid"
 start_cmd="mai_start"
 
-required_files="/usr/pkg/etc/mai/mai.ini"
+required_files="/usr/local/etc/mai/mai.ini"
 
 mai_start() {

trunk/rc.d/OpenBSD

@@ -1 +1 @@
 #!/bin/ksh
-# $TheSupernovaDuo$
+# $YakumoLabs$
 
 daemon="/usr/local/bin/mai"
-daemon_flags="-f /usr/local/etc/mai/mai.ini -u www -g www"
+daemon_flags="-f /usr/local/etc/mai/mai.ini"
 
 . /etc/rc.d/rc.subr

trunk/rc.d/immortal.yml

@@ -1 @@
-cmd: /usr/local/bin/mai -f /usr/local/etc/mai/mai.ini -g www -u www
+# $YakumoLabs$
+cmd: /usr/local/bin/mai -f /usr/local/etc/mai/mai.ini
 cwd: /usr/local/share/mai

trunk/version.go

@@ -8 +8 @@
         // Version release version
         Version = "0.0.1"
-
-        // Commit will be overwritten automatically by the build system
-        Commit = "HEAD"
 )
 
 // FullVersion display the full version and build
 func FullVersion() string {
-        return fmt.Sprintf("%s@%s", Version, Commit)
+        return fmt.Sprintf("%s", Version)
 }