1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-10-18 17:10:11 +00:00

Compare commits

..

No commits in common. "1af8d1f77d1ee9d3c8b4c40081e64803a2e81704" and "2ee0ed55f6bfba024442008f240f0597e9683810" have entirely different histories.

3 changed files with 8 additions and 11 deletions

View File

@ -63,7 +63,7 @@ steps:
volumes:
- /root/.ssh/docker-build:/root/drone_rsa
key_path: /root/drone_rsa
command_timeout: 50m
command_timeout: 30m
script:
- /home/rock64/jfa-go-build/build-stable.sh
trigger:
@ -94,7 +94,7 @@ steps:
volumes:
- /root/.ssh/docker-build:/root/drone_rsa
key_path: /root/drone_rsa
command_timeout: 50m
command_timeout: 30m
script:
- ssh pi /home/pi/jfa-go-build/build-stable.sh
trigger:
@ -125,7 +125,7 @@ steps:
volumes:
- /root/.ssh/docker-build:/root/drone_rsa
key_path: /root/drone_rsa
command_timeout: 50m
command_timeout: 30m
script:
- env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create hrfee/jfa-go:latest --amend hrfee/jfa-go:manifest-latest-amd64 --amend hrfee/jfa-go:manifest-latest-arm64 --amend hrfee/jfa-go:manifest-latest-armhf
- env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push hrfee/jfa-go:latest
@ -206,7 +206,7 @@ steps:
volumes:
- /root/.ssh/docker-build:/root/drone_rsa
key_path: /root/drone_rsa
command_timeout: 50m
command_timeout: 30m
script:
- /home/rock64/jfa-go-build/build.sh
@ -243,7 +243,7 @@ steps:
volumes:
- /root/.ssh/docker-build:/root/drone_rsa
key_path: /root/drone_rsa
command_timeout: 50m
command_timeout: 30m
script:
- ssh pi /home/pi/jfa-go-build/build.sh
@ -280,7 +280,7 @@ steps:
volumes:
- /root/.ssh/docker-build:/root/drone_rsa
key_path: /root/drone_rsa
command_timeout: 50m
command_timeout: 30m
script:
- env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create hrfee/jfa-go:unstable --amend hrfee/jfa-go:manifest-unstable-amd64 --amend hrfee/jfa-go:manifest-unstable-arm64 --amend hrfee/jfa-go:manifest-unstable-armhf
- env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push hrfee/jfa-go:unstable

View File

@ -596,9 +596,7 @@ func start(asDaemon, firstCall bool) {
app.debug.Println("Loading pprof")
pprof.Register(router)
}
for _, p := range routePrefixes {
router.GET(p+"/lang/:page", app.GetLanguages)
}
router.GET("/lang/:page", app.GetLanguages)
if !firstRun {
for _, p := range routePrefixes {
router.GET(p+"/", app.AdminPage)

View File

@ -152,7 +152,6 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
"strings": app.storage.lang.Form[lang].Strings,
"successMessage": app.config.Section("ui").Key("success_message").String(),
"contactMessage": app.config.Section("ui").Key("contact_message").String(),
"jfLink": app.config.Section("jellyfin").Key("public_server").String(),
})
inv, ok := app.storage.invites[code]
if ok {
@ -167,7 +166,7 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
email = ""
}
gcHTML(gc, http.StatusOK, "form-loader.html", gin.H{
"urlBase": app.getURLBase(gc),
"urlBase": app.getURLBase,
"cssClass": app.cssClass,
"contactMessage": app.config.Section("ui").Key("contact_message").String(),
"helpMessage": app.config.Section("ui").Key("help_message").String(),