Remove caddy and all omnibus references.

Signed-off-by: Gregory Schofield <greg.c.schofield@gmail.com>

Author: gscho

.github/workflows/build.yml

@@ -15,6 +15,10 @@ on:
         type: string
         default: ${{ github.ref }}
 
+env:
+  GO_VERSION: '1.22'
+  RUBY_VERSION: '3.4'
+
 jobs:
 
   build:
@@ -28,7 +32,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version: ${{ env.GO_VERSION }}
     - name: Set up ko
       uses: ko-build/setup-ko@v0.9
     - name: Go format check
@@ -50,10 +54,10 @@ jobs:
         args: release --skip validate --skip archive --clean --snapshot
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        KO_DOCKER_REPO: goreleaser.ko.local/gemfast
+        KO_DOCKER_REPO: goreleaser.ko.local
     - name: Save docker image
       run: |
-        docker save goreleaser.ko.local/gemfast/server:latest > gemfast-PR-${{ github.sha }}.tar
+        docker save goreleaser.ko.local/server:latest > gemfast-PR-${{ github.sha }}.tar
     - name: Upload docker image
       uses: actions/upload-artifact@v4
       with:

.gitignore

@@ -4,8 +4,8 @@ prerelease_specs*
 *.gem
 !test/fixtures/gem_list/*.gem
 gemfast.db
-bin/gemfast-server
 omnibus/pkg
 tmp
 !test/fixtures/spec/*.gem
-dist/
+dist/
+bin/

Dockerfile

@@ -1,22 +1,19 @@
-.PHONY: all omnibus test clean
+.PHONY: all test clean
 
 build:
-	go build -mod=mod
-	mv server bin/gemfast-server
-	chmod +x bin/gemfast-server
-
-omnibus:
-	cd omnibus && bundle install
-	cd omnibus && bundle exec omnibus build gemfast
+	go build -o bin/gemfast-server main.go
 
 run:
-	go run -mod=mod main.go start
+	go run main.go start
 
 fmt:
 	go fmt ./...
 
 test:
-	go test -mod=mod ./...
+	go test ./...
+	
+vet:
+	go vet ./...
 
 clean:
 	go clean

Makefile

@@ -5,9 +5,8 @@
 - [Gemfast](#gemfast)
   - [Why Gemfast](#why-gemfast)
   - [Installing](#installing)
-    - [Debian Package](#debian-package)
-      - [Debian Package SSL](#debian-package-ssl)
     - [Docker](#docker)
+    - [Prebuilt Binaries](#prebuilt-binaries)
     - [Building From Source](#building-from-source)
   - [Docs](#docs)
   - [UI](#ui)
@@ -19,41 +18,23 @@ Gemfast was created for users who need to self-host their rubygems and want some
 
 Gemfast has the following unique benefits:
 
-* Two installation methods: [Debian Package](#debian-package) and [Docker Image](#docker)
+* Two installation methods: [Docker Image](#docker) or precompiled binaries
 * No need to install/upgrade/manage a version of Ruby on the server
 * No external server dependencies like postgres, redis or memcached
-* Automatic HTTPS via Caddy
 * User login via GitHub oAuth
-* No external server dependencies like postgres, redis or memcached
 * Allow/Deny gems based on CVE severity or a regex list using the [ruby-advisory-db](https://github.com/rubysec/ruby-advisory-db)
-* Go is generally faster and requires less memory then Ruby (still :heart: Ruby though)
+* Performance benefits of Go
 
 ## Installing
 
-Gemfast is currently distributed in two different ways, a `.deb` package and a `docker` image.
-
-The `.deb` package includes a web server which proxies HTTPS traffic to Gemfast and is recommended when installing Gemfast on a virtual machine or bare-metal instance.
-
-### Debian Package
-
-To install the .deb package, download it from the latest GitHub release and install it with dpkg.
-
-```bash
-curl -L -O gemfast_<version>_amd64.deb
-sudo dpkg -i ./gemfast_<version>_amd64.deb
-sudo systemctl start gemfast.service
-```
-
-#### Debian Package SSL
-
-The Gemfast `.deb` package includes Caddy Server which will automatically generate and manage a let's encrypt SSL certificate for your server. Caddy offers a few ways to generate a valid SSL certificate, see: https://caddyserver.com/docs/automatic-https#acme-challenges. If the let's encrypt challenge fails, the server will use a self-signed certificate.
+Gemfast is currently distributed in two different ways, a `docker` image and precompiled binaries.
 
 ### Docker
 
 When running Gemfast as a container, its important to mount the following directories:
 
-* /etc/gemfast - The directory for the gemfast.hcl config file
 * /var/gemfast - The directory for the Gemfast data including gems and database
+* /etc/gemfast - The directory for the gemfast.hcl config file. It is possible to configure the config file path using `env GEMFAST_CONFIG_FILE=/path/to/my/file.hcl`
 
 ```bash
 docker run -d --name gemfast-server \
@@ -63,6 +44,16 @@ docker run -d --name gemfast-server \
   ghcr.io/gemfast/server:latest
 ```
 
+### Prebuilt Binaries
+
+Currently Prebuild binaries are available on each GitHub release for the following platforms.
+
+- linux_amd64
+- linux_arm64
+- darwin_arm64
+
+Simply download and extract the tarball to run the server.
+
 ### Building From Source
 
 Gemfast uses Make to build binaries. To build and run a static binary:

README.md

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"os"
 	"time"
 
 	"github.com/gemfast/server/internal/api"
@@ -22,11 +23,17 @@ var startCmd = &cobra.Command{
 	},
 }
 
+var configPath string
+
 func init() {
+	startCmd.Flags().StringVarP(&configPath, "config", "c", "", "Path to the config file")
 	rootCmd.AddCommand(startCmd)
 }
 
 func start() {
+	if configPath != "" {
+		os.Setenv("GEMFAST_CONFIG_FILE", configPath)
+	}
 	// Load the config
 	cfg := config.NewConfig()
 	log.Info().Msg("starting services")

bin/.gitkeep

@@ -24,19 +24,11 @@ type Config struct {
 	UIDisabled           bool   `hcl:"ui_disabled,optional"`
 	MetricsDisabled      bool   `hcl:"metrics_disabled,optional"`
 
-	LicenseKey  string          `hcl:"license_key,optional"`
-	CaddyConfig *CaddyConfig    `hcl:"caddy,block"`
-	Mirrors     []*MirrorConfig `hcl:"mirror,block"`
-	Filter      *FilterConfig   `hcl:"filter,block"`
-	CVE         *CVEConfig      `hcl:"cve,block"`
-	Auth        *AuthConfig     `hcl:"auth,block"`
-}
-
-type CaddyConfig struct {
-	AdminAPIEnabled bool   `hcl:"admin_api_enabled,optional"`
-	MetricsDisabled bool   `hcl:"metrics_disabled,optional"`
-	Host            string `hcl:"host,optional"`
-	Port            int    `hcl:"port,optional"`
+	LicenseKey string          `hcl:"license_key,optional"`
+	Mirrors    []*MirrorConfig `hcl:"mirror,block"`
+	Filter     *FilterConfig   `hcl:"filter,block"`
+	CVE        *CVEConfig      `hcl:"cve,block"`
+	Auth       *AuthConfig     `hcl:"auth,block"`
 }
 
 type MirrorConfig struct {
@@ -114,7 +106,6 @@ func NewConfig() *Config {
 
 func (c *Config) setDefaultConfig() {
 	c.setDefaultServerConfig()
-	c.setDefaultCaddyConfig()
 	c.setDefaultMirrorConfig()
 	c.setDefaultAuthConfig()
 	c.setDefaultFilterConfig()
@@ -142,25 +133,6 @@ func (c *Config) setDefaultServerConfig() {
 		c.PrivateGemsNamespace = "private"
 	}
 }
-
-func (c *Config) setDefaultCaddyConfig() {
-	if c.CaddyConfig == nil {
-		c.CaddyConfig = &CaddyConfig{
-			AdminAPIEnabled: false,
-			MetricsDisabled: false,
-			Host:            "https://localhost",
-			Port:            443,
-		}
-		return
-	}
-	if c.CaddyConfig.Port == 0 {
-		c.CaddyConfig.Port = 443
-	}
-	if c.CaddyConfig.Host == "" {
-		c.CaddyConfig.Host = fmt.Sprintf("https://localhost:%d", c.CaddyConfig.Port)
-	}
-}
-
 func configureLogLevel(ll string) {
 	level, err := zerolog.ParseLevel(ll)
 	if err != nil {
@@ -221,7 +193,7 @@ func readJWTSecretKeyFromPath(keyPath string) string {
 }
 
 func (c *Config) setDefaultAuthConfig() {
-	defaultJWTSecretKeyPath := "/opt/gemfast/etc/gemfast/.jwt_secret_key"
+	defaultJWTSecretKeyPath := ".jwt_secret_key"
 	if c.Auth == nil {
 		c.Auth = &AuthConfig{
 			Type:               "local",
@@ -272,14 +244,14 @@ func (c *Config) setDefaultCVEConfig() {
 		c.CVE = &CVEConfig{
 			Enabled:           false,
 			MaxSeverity:       "high",
-			RubyAdvisoryDBDir: "/opt/gemfast/share/ruby-advisory-db",
+			RubyAdvisoryDBDir: "ruby-advisory-db",
 		}
 		return
 	}
 	if c.CVE.MaxSeverity == "" {
 		c.CVE.MaxSeverity = "high"
 	}
 	if c.CVE.RubyAdvisoryDBDir == "" {
-		c.CVE.RubyAdvisoryDBDir = "/opt/gemfast/share/ruby-advisory-db"
+		c.CVE.RubyAdvisoryDBDir = "ruby-advisory-db"
 	}
 }