Fixed linter error

.woodpecker.yml

@@ -0,0 +1,5 @@
+pipeline:
+  lint:
+    image: warpnetbv/salt-lint:v0.9.2
+    commands:
+      - 'find . -type f -name "*.sls" -print0 | xargs -0 --no-run-if-empty salt-lint'

gitea/config/file.sls

@@ -14,5 +14,10 @@ gitea_config_file:
     - user: {{ gitea.config_owner }}
     - group: {{ gitea.config_group }}
     - mode: {{ gitea.config_mode }}
+    - source: 'salt://gitea/files/app.ini.jinja'
+    - template: 'jinja'
+    - makedirs: True
+    - context:
+        gitea: {{ gitea.config | json }}
     - require:
       - sls: {{ sls_package_install }}

gitea/defaults.yaml

@@ -10,3 +10,31 @@ gitea:
   config_mode: 0644
   service_name: 'gitea'
   service_enabled: True
+
+  # App configuration defaults
+  config:
+    app_name: 'Gitea: Git with a cup of tea'
+    run_user: 'git'
+    run_mode: 'prod'
+    app_data_path: '/var/lib/gitea'
+    security:
+      secret_key: 'ChangeMeBeforeRunning'
+    server:
+      domain: 'localhost'
+      http_address: '127.0.0.1'
+      http_port: '3000'
+      app_url: 'http://localhost:3000/'
+      disable_ssh: False
+      ssh_domain: "%(DOMAIN)s"
+      ssh_port: 22
+      offline_mode: False
+    database:
+      driver: 'sqlite3'
+      host: '127.0.0.1:3306'
+      name: 'gitea'
+      user: 'gitea'
+      password: ''
+      path: '/var/lib/gitea/data/gitea.db'
+      ssl: 'disable'
+      charset: 'utf8'
+      log_sql: 'false'

gitea/files/app.ini.jinja

@@ -0,0 +1,93 @@
+#
+# For information on the available settings, consult the online
+# documentation, or see the accompanying file app.ini.defaults, which
+# contains the settings incorporated into the gitea binary.
+#
+# This sample configuration runs Gitea with a local database.  Before
+# running this configuration, make sure to change the INTERNAL_TOKEN,
+# JWT_SECRET, and SECRET_KEY variables.  SECRET_KEY is a password of your
+# choosing, INTERNAL_TOKEN is a 64-byte random number in BASE64 encoding,
+# JWT_SECRET is a 32-byte random number in BASE64 encoding.
+# 
+# You can generate the token using for example:
+#   openssl rand -base64 64
+# 
+# You can let Gitea add these to the config for you; you need to make
+# app.ini writeable by the git user.
+#
+# There are no pre-configured users; the first user to register becomes an
+# admin.  In this sample configuration, the HTTP server only listens on
+# localhost.
+#
+# If you'd rather use the web-based installer, remove this conf/app.ini file
+# and make /usr/local/etc/gitea/conf writeable to the git user.
+
+APP_NAME = {{ gitea.app_name }}
+RUN_USER = {{ gitea.run_user }}
+RUN_MODE = {{ gitea.run_mode }}
+
+[database]
+DB_TYPE  = {{ gitea.database.driver }}
+HOST     = {{ gitea.database.host }}
+NAME     = {{ gitea.database.name }}
+USER     = {{ gitea.database.user }}
+PASSWD   = {{ gitea.database.password }}
+PATH     = {{ gitea.database.path }}
+SSL_MODE = {{ gitea.database.ssl }}
+CHARSET  = {{ gitea.database.charset }}
+LOG_SQL  = {{ gitea.database.log_sql }}
+
+[indexer]
+ISSUE_INDEXER_PATH = {{ gitea.app_data_path }}/indexers/issues.bleve
+
+[log]
+ROOT_PATH = /var/log/gitea
+MODE      = file
+LEVEL     = Info
+
+[mailer]
+ENABLED = false
+
+[oauth2]
+JWT_SECRET = D56bmu6xCtEKs9vKKgMKnsa4X9FDwo64HVyaS4fQ4mY
+
+[picture]
+AVATAR_UPLOAD_PATH      = {{ gitea.app_data_path }}/data/avatars
+DISABLE_GRAVATAR        = false
+ENABLE_FEDERATED_AVATAR = false
+
+[repository]
+ROOT = {{ gitea.app_data_path }}/gitea-repositories
+# Gitea's default is 'bash', so if you have bash installed, you can comment
+# this out.
+SCRIPT_TYPE = sh
+
+[repository.upload]
+TEMP_PATH = {{ gitea.app_data_path }}/data/tmp/uploads
+
+[security]
+INSTALL_LOCK = true
+INTERNAL_TOKEN = 1FFhAklka01JhgJTRUrFujWYiv4ijqcTIfXJ9o4n1fWxz+XVQdXhrqDTlsnD7fvz7gugdhgkx0FY2Lx6IBdPQw==
+SECRET_KEY   = {{ gitea.security.secret_key }}
+
+[session]
+PROVIDER = file
+PROVIDER_CONFIG = {{ gitea.app_data_path }}/data/sessions
+
+[server]
+DOMAIN       = {{ gitea.server.domain }}
+HTTP_ADDR    = {{ gitea.server.http_address }}
+HTTP_PORT    = {{ gitea.server.http_port }}
+ROOT_URL     = {{ gitea.server.app_url }}
+DISABLE_SSH  = {{ gitea.server.disable_ssh }}
+SSH_DOMAIN   = {{ gitea.server.ssh_domain }}
+SSH_PORT     = {{ gitea.server.ssh_port }}
+OFFLINE_MODE = {{ gitea.server.offline_mode }}
+APP_DATA_PATH = {{ gitea.app_data_path }}/data
+
+[service]
+REGISTER_EMAIL_CONFIRM = false
+ENABLE_NOTIFY_MAIL     = false
+DISABLE_REGISTRATION   = false
+ENABLE_CAPTCHA         = true
+REQUIRE_SIGNIN_VIEW    = false

gitea/osfamilymap.yaml

@@ -2,4 +2,8 @@
 # vim: ft=yaml
 
 FreeBSD:
-  config_path: '/usr/local/etc/gitea/app.ini'
+  config_path: '/usr/local/etc/gitea/conf/app.ini'
+  config:
+    app_data_path: '/var/db/gitea'
+    database:
+      path: '/var/db/gitea/data/gitea.db'