.woodpecker.yml

@@ -1,5 +0,0 @@
-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

@@ -18,6 +18,6 @@ gitea_config_file:
     - template: 'jinja'
     - makedirs: True
     - context:
-        gitea: {{ gitea.config | json }}
+      gitea: {{ gitea.config | json }}
     - require:
       - sls: {{ sls_package_install }}

gitea/defaults.yaml

@@ -8,33 +8,6 @@ gitea:
   config_owner: 'gitea'
   config_group: 'gitea'
   config_mode: 0644
+  config: {}
   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

@@ -22,23 +22,21 @@
 # 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 }}
+APP_NAME = Gitea: Git with a cup of tea
+RUN_USER = git
+RUN_MODE = prod
 
 [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 }}
+DB_TYPE  = sqlite3
+HOST     = 127.0.0.1:3306
+NAME     = gitea
+PASSWD   = 
+PATH     = /var/db/gitea/gitea.db
+SSL_MODE = disable
+USER     = root
 
 [indexer]
-ISSUE_INDEXER_PATH = {{ gitea.app_data_path }}/indexers/issues.bleve
+ISSUE_INDEXER_PATH = /var/db/gitea/indexers/issues.bleve
 
 [log]
 ROOT_PATH = /var/log/gitea
@@ -52,38 +50,38 @@ ENABLED = false
 JWT_SECRET = D56bmu6xCtEKs9vKKgMKnsa4X9FDwo64HVyaS4fQ4mY
 
 [picture]
-AVATAR_UPLOAD_PATH      = {{ gitea.app_data_path }}/data/avatars
+AVATAR_UPLOAD_PATH      = /var/db/gitea/data/avatars
 DISABLE_GRAVATAR        = false
 ENABLE_FEDERATED_AVATAR = false
 
 [repository]
-ROOT = {{ gitea.app_data_path }}/gitea-repositories
+ROOT = /var/db/gitea/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
+TEMP_PATH = /var/db/gitea/data/tmp/uploads
 
 [security]
 INSTALL_LOCK = true
 INTERNAL_TOKEN = 1FFhAklka01JhgJTRUrFujWYiv4ijqcTIfXJ9o4n1fWxz+XVQdXhrqDTlsnD7fvz7gugdhgkx0FY2Lx6IBdPQw==
-SECRET_KEY   = {{ gitea.security.secret_key }}
+SECRET_KEY   = ChangeMeBeforeRunning
 
 [session]
 PROVIDER = file
-PROVIDER_CONFIG = {{ gitea.app_data_path }}/data/sessions
+PROVIDER_CONFIG = /var/db/gitea/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
+DOMAIN       = localhost
+HTTP_ADDR    = 127.0.0.1
+HTTP_PORT    = 3000
+ROOT_URL     = http://localhost:3000/
+DISABLE_SSH  = false
+SSH_DOMAIN   = %(DOMAIN)s
+SSH_PORT     = 22
+OFFLINE_MODE = false
+APP_DATA_PATH = /var/db/gitea/data
 
 [service]
 REGISTER_EMAIL_CONFIRM = false

gitea/osfamilymap.yaml

@@ -3,7 +3,3 @@
 
 FreeBSD:
   config_path: '/usr/local/etc/gitea/conf/app.ini'
-  config:
-    app_data_path: '/var/db/gitea'
-    database:
-      path: '/var/db/gitea/data/gitea.db'