Skip to content

Commit

Permalink
Remove Go webserver, as there's no need for it anymore
Browse files Browse the repository at this point in the history
7d1c85f replaced the links served by it.

As for the files served from our GitHub repository (AUTHORS and LICENSE), a Lua script now takes care of doing that.
  • Loading branch information
davidebeatrici committed Feb 25, 2021
1 parent 9abc68d commit 8c3f37f
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 497 deletions.
27 changes: 0 additions & 27 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,6 @@ variables:
HUGO_SHA: 11c46ecc3ad6d96f94515358e5528d01dfe88f4956b56027c85e9a516348ef12

jobs:
- job: go_webserver
steps:
- script: |
go version
displayName: 'Go Version Information'
- script: |
go version
go get -v .
workingDirectory: 'src'
displayName: 'Get Go Webserver Dependencies'
- script: |
go version
go build -v .
mkdir ../bin
mv mumble-www ../bin
workingDirectory: 'src'
displayName: 'Build Go Webserver'
- script: |
go version
go test
workingDirectory: 'src'
displayName: 'Execute Go Webserver Tests'
- task: PublishPipelineArtifact@0
inputs:
artifactName: 'mumble-www'
targetPath: 'bin'

- job: hugo
steps:
- script: |
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Compiled server
/mumble-www
/mumble-www.exe

# Generated site
/public/
/mumble-www.7z
Expand Down
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
all: public mumble-www package
all: public package

public: $(shell find hugo/ -type f)
(cd hugo/; hugo)

mumble-www: mumble-www.go githubcache.go snapshotcache.go config.go downloads.go programflags.go
(cd src/; GO111MODULE=on go build -o ../$@ $^)

package: public mumble-www
7z a mumble-www.7z public mumble-www
package: public
7z a mumble-www.7z public
18 changes: 2 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@

Source of the Mumble Website. The live website is available at [www.mumble.info](https://www.mumble.info).

Implemented and served through a combination of a Go webserver for dynamic content and static files generated with [hugo](https://gohugo.io/).
Implemented through static files generated with [hugo](https://gohugo.io/), their source resides in the `hugo` folder.

## Go Webserver

* Cache the `LICENSE` and `AUTHORS` files from GitHub and serve them
* Redirect predefined stable download URLs to download files
* Redirect predefined snapshot download URLs; cached self-updating target URLs
* Redirect Ubuntu snapshots to the PPA
* Serve static website files (generated with Hugo)

The go source files reside in the `src` folder.

## Static Website

The website source resides in the `hugo` folder.

It is buildable with [Hugo](gohugo.io/). After navigating into the `hugo` folder: The `hugo` command will place the generated website files in the `public` folder. An interactive, auto-updating development server can be launched with `hugo server`.
After navigating into the `hugo` folder: The `hugo` command will place the generated website files in the `public` folder. An interactive, auto-updating development server can be launched with `hugo server`.
21 changes: 0 additions & 21 deletions build-go.bat

This file was deleted.

5 changes: 1 addition & 4 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ hugo
IF ERRORLEVEL 1 (EXIT /B 1)
POPD

call build-go.bat
IF ERRORLEVEL 1 (EXIT /B 1)

DEL mumble-www.7z 1>NUL
IF ERRORLEVEL 1 EXIT /B 1

7z.exe a mumble-www.7z public mumble-www
7z.exe a mumble-www.7z public
IF ERRORLEVEL 1 EXIT /B 1

POPD
33 changes: 0 additions & 33 deletions src/config.go

This file was deleted.

34 changes: 0 additions & 34 deletions src/downloads.go

This file was deleted.

117 changes: 0 additions & 117 deletions src/githubcache.go

This file was deleted.

8 changes: 0 additions & 8 deletions src/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions src/go.sum

This file was deleted.

46 changes: 0 additions & 46 deletions src/mumble-www.go

This file was deleted.

4 changes: 0 additions & 4 deletions src/mumble-www.yaml

This file was deleted.

Loading

0 comments on commit 8c3f37f

Please sign in to comment.