diff --git a/states/gitea/defaults.yaml b/states/gitea/defaults.yaml index e4583a1..2e9e76d 100644 --- a/states/gitea/defaults.yaml +++ b/states/gitea/defaults.yaml @@ -24,7 +24,7 @@ gitea: root: /var/lib/gitea/gitea-repositories server: domain: git.example.com - http_addr: 0.0.0.0 + http_addr: "::" http_port: 3000 root_url: https://git.example.com/ disable_ssh: "true" diff --git a/states/gitea/files/app.ini.old.j2 b/states/gitea/files/app.ini.old.j2 deleted file mode 100644 index c5d9d7f..0000000 --- a/states/gitea/files/app.ini.old.j2 +++ /dev/null @@ -1,118 +0,0 @@ -## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} - -{% from "gitea/map.jinja" import gitea with context %} -APP_NAME = {{ gitea.service.app_name }} -RUN_USER = git -RUN_MODE = prod - -[database] -DB_TYPE = {{ gitea.database.type }} -HOST = {{ gitea.database.host }} -NAME = {{ gitea.database.name }} -USER = {{ gitea.database.user }} -PASSWD = {{ gitea.database.password }} -{%- if gitea.database.ssl %} -SSL_MODE = enable -{%- else %} -SSL_MODE = disable -{%- endif %} -PATH = {{ gitea.database.path }} - -[repository] -ROOT = {{ gitea.repository.root }} - -[server] -DOMAIN = {{ gitea.server.domain }} -HTTP_ADDR = {{ gitea.server.http_addr }} -HTTP_PORT = {{ gitea.server.http_port }} -{%- if gitea.server.https %} -ROOT_URL = https://{{ gitea.server.domain }}/ -{%- else %} -ROOT_URL = http://{{ gitea.server.domain }}/ -{%- endif %} -DISABLE_SSH = {{ gitea.server.disable_ssh }} -START_SSH_SERVER = {{ gitea.server.start_ssh_server }} -SSH_DOMAIN = {{ gitea.server.domain }} -SSH_PORT = {{ gitea.server.ssh_port }} -SSH_LISTEN_PORT = {{ gitea.server.ssh_listen_port }} -OFFLINE_MODE = {{ gitea.server.offline_mode }} -LFS_START_SERVER = {{ gitea.server.lfs_start_server }} -LFS_CONTENT_PATH = {{ gitea.server.lfs_content_path }} -LFS_JWT_SECRET = {{ gitea.server.lfs_jwt_secret }} -ENABLE_GZIP = {{ gitea.server.enable_gzip }} -LANDING_PAGE = {{ gitea.server.landing_page }} - -[cache] -ENABLED = {{ gitea.cache.enabled }} -ADAPTER = {{ gitea.cache.adapter }} -HOST = {{ gitea.cache.host }} - -[mailer] -ENABLED = {{ gitea.mailer.enable }} -HELO_HOSTNAME = {{ gitea.mailer.hostname }} -HOST = {{ gitea.mailer.hostandport }} -IS_TLS_ENABLED = {{ gitea.mailer.is_tls_enabled }} -FROM = {{ gitea.mailer.from_address }} -USER = {{ gitea.mailer.smtp_user }} -PASSWD = {{ gitea.mailer.smtp_password }} -SKIP_VERIFY = {{ gitea.mailer.skip_verify }} - -[service] -REGISTER_EMAIL_CONFIRM = {{ gitea.service.register_email_confirm }} -DISABLE_REGISTRATION = {{ gitea.service.disable_registration }} -ENABLE_CAPTCHA = {{ gitea.service.enable_captcha }} -REQUIRE_SIGNIN_VIEW = {{ gitea.service.require_signin_view }} -ENABLE_NOTIFY_MAIL = {{ gitea.service.enable_notify_mail }} - -[picture] -DISABLE_GRAVATAR = {{ gitea.picture.disable_gravatar }} - -[attachment] -ENABLED = {{ gitea.attachment.enabled }} -PATH = {{ gitea.attachment.path }} -ALLOWED_TYPES = {{ gitea.attachment.allowed_types }} -MAX_SIZE = {{ gitea.attachment.max_size }} -MAX_FILES = {{ gitea.attachment.max_files }} - -[cron] -ENABLED = true -RUN_AT_START = false - -[cron.update_mirrors] -SCHEDULE = "0 12 3 * * *" - -[cron.archive_cleanup] -ENABLED = false - -[cron.delete_repo_archives] -ENABLED = false - -[session] -PROVIDER = file -COOKIE_SECURE = {{ gitea.server.https }} -COOKIE_NAME = i_like_gitea - -[log] -MODE = {{ gitea.log.mode }} -LEVEL = {{ gitea.log.level }} - -[security] -INSTALL_LOCK = {{ gitea.security.install_lock }} -SECRET_KEY = {{ gitea.get('security.secret_key', salt['grains.get_or_set_hash']( - 'gitea:security_secret_key', - length=15, - chars=('abcdefghijklmnopqrstuvwxyz' + - 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + - '12345678790') -)) }} -LOGIN_REMEMBER_DAYS = {{ gitea.security.remember_password_days }} -COOKIE_USERNAME = giteauser -COOKIE_REMEMBER_NAME = giteausersession -INTERNAL_TOKEN = {{ gitea.security.internal_token }} - -[other] -SHOW_FOOTER_BRANDING = {{ gitea.other.show_footer_branding }} -SHOW_FOOTER_VERSION = {{ gitea.other.show_footer_version }} - -[oauth2] -JWT_SECRET = {{ gitea.server.lfs_jwt_secret }}