From e0a8e7af55ff54b6d6b9ad22b82e245e4ddb8b18 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Nov 2021 15:18:35 +0100 Subject: [PATCH] Update app.ini --- conf/app.ini | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index 2d1d897..7e4069c 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -1,23 +1,14 @@ ;https://github.com/gogits/gogs/blob/master/conf/app.ini -<<<<<<< Updated upstream -BRAND_NAME = Gogs -======= ; The brand name of the application, can be your company or team name. BRAND_NAME = Gogs ; The system user who should be running the applications. It has no effect on Windows, ; otherwise, it should match the value of $USER environment variable. ->>>>>>> Stashed changes RUN_USER = __APP__ ; The running mode of the application, can be either "dev", "prod" or "test". RUN_MODE = prod [server] -<<<<<<< Updated upstream -EXTERNAL_URL = https://__URL__/ -DOMAIN = __DOMAIN__ -HTTP_PORT = __PORT__ -======= ; The public-facing URL for the application. EXTERNAL_URL = https://__URL__/ ; The public-facing domain name for the application. @@ -26,7 +17,6 @@ DOMAIN = __DOMAIN__ ; Currently supports "http", "https", "fcgi" and "unix". PROTOCOL = http ; The address to be listened by the application. ->>>>>>> Stashed changes HTTP_ADDR = 127.0.0.1 ; The port number to be listened by the application. HTTP_PORT = __PORT__ @@ -70,12 +60,6 @@ DISABLE_SSH = false SSH_DOMAIN = %(DOMAIN)s ; The port number to be exposed in SSH clone URL. SSH_PORT = 22 -<<<<<<< Updated upstream -APP_DATA_PATH = __DATADIR__/data -LANDING_PAGE = explore -CERT_FILE = /etc/yunohost/certs/__DOMAIN__/crt.pem -KEY_FILE = /etc/yunohost/certs/__DOMAIN__/key.pem -======= ; The path of SSH root directory, default is "$HOME/.ssh". SSH_ROOT_PATH = ; The path to ssh-keygen, default is "ssh-keygen" and let shell find out which one to call. @@ -104,7 +88,6 @@ ED25519 = 256 ECDSA = 256 RSA = 2048 DSA = 1024 ->>>>>>> Stashed changes [repository] ; The root path for storing managed repositories, default is "~/gogs-repositories" @@ -162,9 +145,6 @@ TYPE = mysql HOST = 127.0.0.1:3306 NAME = __DB_NAME__ USER = __DB_USER__ -<<<<<<< Updated upstream -PASSWD = __DB_PWD__ -======= PASSWORD = __DB_PWD__ ; For "postgres" only, either "disable", "require" or "verify-full". SSL_MODE = disable @@ -174,7 +154,6 @@ PATH = data/gogs.db MAX_OPEN_CONNS = 30 ; The maximum idle connections of the pool. MAX_IDLE_CONNS = 30 ->>>>>>> Stashed changes [security] ; Whether to show the install page, set this to "true" to bypass it. @@ -196,10 +175,7 @@ ENABLE_LOGIN_STATUS_COOKIE = false LOGIN_STATUS_COOKIE_NAME = login_status [email] -<<<<<<< Updated upstream -======= ; Whether to enable the email service. ->>>>>>> Stashed changes ENABLED = true ; The prefix prepended to the subject line. SUBJECT_PREFIX = `[%(BRAND_NAME)s] ` @@ -207,9 +183,6 @@ SUBJECT_PREFIX = `[%(BRAND_NAME)s] ` ; If the port ends is "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. ; If the server supports STARTTLS it will always be used. HOST = 127.0.0.1:25 -<<<<<<< Updated upstream -FROM = "Gogs" -======= ; The email from address (RFC 5322). This can be just an email address, or the `"Name" ` format. FROM = "Gogs" ; The login user. @@ -223,7 +196,6 @@ DISABLE_HELO = HELO_HOSTNAME = ; Whether to skip verifying the certificate of the server. Only use this for self-signed certificates. ->>>>>>> Stashed changes SKIP_VERIFY = true ; Whether to use client certificates. USE_CERTIFICATE = false @@ -258,7 +230,6 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false ; The HTTP header used as username for reverse proxy authentication. REVERSE_PROXY_AUTHENTICATION_HEADER = X-WEBAUTH-USER - [user] ; Whether to enable email notifications for users. ENABLE_EMAIL_NOTIFICATION = false