summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-02-01 12:41:03 -0500
committerUnknwon <joe2010xtmf@163.com>2015-02-01 12:41:03 -0500
commitb293b6eaa6b305bbac2147f76d5722607e8aa04b (patch)
tree92e60483c65594729b7bbcf60ca9d15b1932be1f /conf
parent3d9cda2d98940102b1bdffc053e036cc696b9f8e (diff)
downloadgitea-b293b6eaa6b305bbac2147f76d5722607e8aa04b.tar.gz
gitea-b293b6eaa6b305bbac2147f76d5722607e8aa04b.zip
cmd: CMD option for port number of `gogs web` to prevent first time run conflict
- routers: use new binding convention to simplify code - templates: able to set HTTP port number in install page
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini3
-rw-r--r--conf/locale/locale_en-US.ini2
2 files changed, 5 insertions, 0 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 1af480a825..0724215051 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -1,3 +1,6 @@
+# NEVER EVER MODIFY THIS FILE
+# PLEASE MAKE CHANGES ON CORRESPONDING CUSTOM CONFIG FILE
+
; App name that shows on every page title
APP_NAME = Gogs: Go Git Service
; Change it if you run locally
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 7db7ca0d47..534e8d3879 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -59,6 +59,8 @@ run_user = Run User
run_user_helper = The user must have access to Repository Root Path and run Gogs.
domain = Domain
domain_helper = This affects SSH clone URLs.
+http_port = HTTP Port
+http_port_helper = Port number which application will listen on.
app_url = Application URL
app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in e-mail.
email_title = E-mail Service Settings (Optional)