Config: Change "web server" to "Web server" in the docs for consistency
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
parent
9cfd9c0b66
commit
cfe1ff3299
6 changed files with 10 additions and 10 deletions
|
@ -45,7 +45,7 @@ var startFlags = []cli.Flag{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// startAction starts the web server and initializes the daemon.
|
// startAction starts the Web server and initializes the daemon.
|
||||||
func startAction(ctx *cli.Context) error {
|
func startAction(ctx *cli.Context) error {
|
||||||
conf, err := InitConfig(ctx)
|
conf, err := InitConfig(ctx)
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ func startAction(ctx *cli.Context) error {
|
||||||
log.Infof("config: enabled read-only mode")
|
log.Infof("config: enabled read-only mode")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start web server.
|
// Start Web server.
|
||||||
go server.Start(cctx, conf)
|
go server.Start(cctx, conf)
|
||||||
|
|
||||||
if count, err := photoprism.RestoreAlbums(conf.AlbumsPath(), false); err != nil {
|
if count, err := photoprism.RestoreAlbums(conf.AlbumsPath(), false); err != nil {
|
||||||
|
|
|
@ -20,7 +20,7 @@ var StatusCommand = cli.Command{
|
||||||
Action: statusAction,
|
Action: statusAction,
|
||||||
}
|
}
|
||||||
|
|
||||||
// statusAction checks if the web server is running.
|
// statusAction checks if the Web server is running.
|
||||||
func statusAction(ctx *cli.Context) error {
|
func statusAction(ctx *cli.Context) error {
|
||||||
conf := config.NewConfig(ctx)
|
conf := config.NewConfig(ctx)
|
||||||
|
|
||||||
|
|
|
@ -511,13 +511,13 @@ var Flags = CliFlags{
|
||||||
Flag: cli.StringFlag{
|
Flag: cli.StringFlag{
|
||||||
Name: "http-host, ip",
|
Name: "http-host, ip",
|
||||||
Value: "0.0.0.0",
|
Value: "0.0.0.0",
|
||||||
Usage: "web server `IP` address or Unix domain socket, e.g. unix:/var/run/photoprism.sock",
|
Usage: "Web server `IP` address or Unix domain socket, e.g. unix:/var/run/photoprism.sock",
|
||||||
EnvVar: EnvVar("HTTP_HOST"),
|
EnvVar: EnvVar("HTTP_HOST"),
|
||||||
}}, {
|
}}, {
|
||||||
Flag: cli.IntFlag{
|
Flag: cli.IntFlag{
|
||||||
Name: "http-port, port",
|
Name: "http-port, port",
|
||||||
Value: 2342,
|
Value: 2342,
|
||||||
Usage: "web server port `NUMBER`, ignored for Unix domain sockets",
|
Usage: "Web server port `NUMBER`, ignored for Unix domain sockets",
|
||||||
EnvVar: EnvVar("HTTP_PORT"),
|
EnvVar: EnvVar("HTTP_PORT"),
|
||||||
}}, {
|
}}, {
|
||||||
Flag: cli.StringFlag{
|
Flag: cli.StringFlag{
|
||||||
|
|
|
@ -9,7 +9,7 @@ import (
|
||||||
|
|
||||||
var APIv1 *gin.RouterGroup
|
var APIv1 *gin.RouterGroup
|
||||||
|
|
||||||
// registerRoutes configures the available web server routes.
|
// registerRoutes configures the available Web server routes.
|
||||||
func registerRoutes(router *gin.Engine, conf *config.Config) {
|
func registerRoutes(router *gin.Engine, conf *config.Config) {
|
||||||
// Enables automatic redirection if the current route cannot be matched but a
|
// Enables automatic redirection if the current route cannot be matched but a
|
||||||
// handler for the path with (without) the trailing slash exists.
|
// handler for the path with (without) the trailing slash exists.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Package server provides REST and web server routing, request handling and logging.
|
Package server provides REST and Web server routing, request handling and logging.
|
||||||
|
|
||||||
Copyright (c) 2018 - 2023 PhotoPrism UG. All rights reserved.
|
Copyright (c) 2018 - 2023 PhotoPrism UG. All rights reserved.
|
||||||
|
|
||||||
|
|
|
@ -143,7 +143,7 @@ func Start(ctx context.Context, conf *config.Config) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartHttp starts the web server in http mode.
|
// StartHttp starts the Web server in http mode.
|
||||||
func StartHttp(s *http.Server, l net.Listener) {
|
func StartHttp(s *http.Server, l net.Listener) {
|
||||||
if err := s.Serve(l); err != nil {
|
if err := s.Serve(l); err != nil {
|
||||||
if err == http.ErrServerClosed {
|
if err == http.ErrServerClosed {
|
||||||
|
@ -154,7 +154,7 @@ func StartHttp(s *http.Server, l net.Listener) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartTLS starts the web server in https mode.
|
// StartTLS starts the Web server in https mode.
|
||||||
func StartTLS(s *http.Server, httpsCert, privateKey string) {
|
func StartTLS(s *http.Server, httpsCert, privateKey string) {
|
||||||
if err := s.ListenAndServeTLS(httpsCert, privateKey); err != nil {
|
if err := s.ListenAndServeTLS(httpsCert, privateKey); err != nil {
|
||||||
if err == http.ErrServerClosed {
|
if err == http.ErrServerClosed {
|
||||||
|
@ -165,7 +165,7 @@ func StartTLS(s *http.Server, httpsCert, privateKey string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartAutoTLS starts the web server with auto tls enabled.
|
// StartAutoTLS starts the Web server with auto tls enabled.
|
||||||
func StartAutoTLS(s *http.Server, m *autocert.Manager, conf *config.Config) {
|
func StartAutoTLS(s *http.Server, m *autocert.Manager, conf *config.Config) {
|
||||||
var g errgroup.Group
|
var g errgroup.Group
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue