diff --git a/.cruft.json b/.cruft.json
index d77b41e..a761b2d 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -20,7 +20,7 @@
       "abbr_pysafe": "gitea",
       "pkg": "gitea",
       "needs_repo": "",
-      "config": "/var/opt/gitea/custom/conf/app.ini",
+      "config": "/etc/gitea/app.ini",
       "service": "gitea",
       "subcomponent": "",
       "subcomponent_config": "",
@@ -28,14 +28,14 @@
       "_lookup": {
         "paths": {
           "bin": "/opt/gitea",
-          "conf": "/etc/opt/gitea",
-          "custom": "/var/opt/gitea/custom",
-          "data": "/var/opt/gitea/data",
-          "home": "/var/opt/gitea/home",
-          "internal_token_uri": "file:///etc/opt/gitea/internal_token",
-          "log": "/var/opt/gitea/log",
-          "repos": "/var/opt/gitea/data/gitea-repositories",
-          "work": "/var/opt/gitea"
+          "conf": "/etc/gitea",
+          "custom": "/var/lib/gitea/custom",
+          "data": "/var/lib/gitea/data",
+          "home": "/var/lib/gitea/home",
+          "internal_token_uri": "file:///etc/gitea/internal_token",
+          "log": "/var/log/gitea",
+          "repos": "/var/lib/gitea/data/gitea-repositories",
+          "work": "/var/lib/gitea"
         },
         "requirements": [
           "git",
@@ -72,6 +72,7 @@
         },
         "service": {
           "requires_mount": [],
+          "socket_activation": false,
           "wants": []
         },
         "config": {
diff --git a/gitea/files/default/gitea.main.socket.j2 b/gitea/files/default/gitea.main.socket.j2
new file mode 100644
index 0000000..e5f42a4
--- /dev/null
+++ b/gitea/files/default/gitea.main.socket.j2
@@ -0,0 +1,20 @@
+{%- if "unix" in gitea.config | traverse("server:protocol", "http") -%}
+{%-   set stream = gitea.config | traverse("server:http_addr", "/run/gitea/gitea.socket") -%}
+{%- else -%}
+{%-   set stream = gitea.config | traverse("server:http_port", "3000") -%}
+{%-   if gitea.config | traverse("server:http_addr", "") -%}
+{%-     set stream = gitea.config.server.http_addr ~ ":" ~ stream -%}
+{%-   endif -%}
+{%- endif -%}
+
+[Unit]
+Description=Gitea Web Socket
+PartOf={{ gitea.lookup.service.name }}.service
+
+[Socket]
+Service={{ gitea.lookup.service.name }}.service
+ListenStream={{ stream }}
+NoDelay=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/gitea/files/default/gitea.service.j2 b/gitea/files/default/gitea.service.j2
index 32128ee..a292a8f 100644
--- a/gitea/files/default/gitea.service.j2
+++ b/gitea/files/default/gitea.service.j2
@@ -1,103 +1,107 @@
-{#- To keep the below "readable", set short vars here. -#}
-{%- set work = gitea.lookup.paths.work -%}
-{%- set bin = gitea.lookup.paths.bin | path_join('gitea') -%}
-{%- set user = gitea.lookup.user -%}
-{%- set home = salt['user.info'](gitea.lookup.user).home -%}
-{%- set config = gitea.lookup.paths.conf | path_join('app.ini') -%}
-{%- set custom_needed = gitea.lookup.paths.custom != (gitea.lookup.paths.work | path_join('custom')) -%}
-{%- set custom = gitea.lookup.paths.custom -%}
+{%- set rw = gitea._rw + [
+    gitea.lookup.paths.conf | path_join("app.ini")
+] -%}
+
+{%- set needs_port_cap =
+      gitea.config | traverse("server:http_port", 3000) < 1024
+    or (
+      not gitea.config | traverse("server:disable_ssh", false)
+      and gitea.config | traverse("server:start_ssh_server", false)
+      and gitea.config | traverse("server:ssh_port", 22) < 1024
+    )
+-%}
+
+{%- set needs_custom = gitea.lookup.paths.custom != (gitea.lookup.paths.work | path_join('custom')) -%}
+
+# https://github.com/archlinux/svntogit-community/blob/3474a4abbfa932796b33cf5d11d9e5312cebec1a/trunk/gitea.service
 
 [Unit]
 Description=Gitea (Git with a cup of tea)
-After=syslog.target
+Documentation=https://docs.gitea.io/en-us/
 After=network.target
+
+{%- if gitea.service.socket_activation %}
+After={{ gitea.lookup.service.name }}.main.socket
+Requires={{ gitea.lookup.service.name }}.main.socket
+{%- endif %}
+
 {%- if gitea.service.wants %}
 {%-   for wanted in gitea.service.wants %}
-Wants={{ wanted }}.service
-After={{ wanted }}.service
+Wants={{ wanted }}{{ ".service" if "." not in wanted }}
+After={{ wanted }}{{ ".service" if "." not in wanted }}
 {%-   endfor %}
 {%- endif %}
+
 {%- if gitea.service.requires_mount %}
 {%-   for mount in gitea.service.requires_mount %}
 RequiresMountsFor={{ mount }}
 {%-   endfor %}
 {%- endif %}
-###
-# Don't forget to add the database service dependencies
-###
-#
-#Wants=mysql.service
-#After=mysql.service
-#
-#Wants=mariadb.service
-#After=mariadb.service
-#
-#Wants=postgresql.service
-#After=postgresql.service
-#
-#Wants=memcached.service
-#After=memcached.service
-#
-#Wants=redis.service
-#After=redis.service
-#
-###
-# If using socket activation for main http/s
-###
-#
-#After=gitea.main.socket
-#Requires=gitea.main.socket
-#
-###
-# (You can also provide gitea an http fallback and/or ssh socket too)
-#
-# An example of /etc/systemd/system/gitea.main.socket
-###
-##
-## [Unit]
-## Description=Gitea Web Socket
-## PartOf=gitea.service
-##
-## [Socket]
-## Service=gitea.service
-## ListenStream=<some_port>
-## NoDelay=true
-##
-## [Install]
-## WantedBy=sockets.target
-##
-###
 
 [Service]
-# Modify these two values and uncomment them if you have
-# repos with lots of files and get an HTTP error 500 because
-# of that
-###
-#LimitMEMLOCK=infinity
-#LimitNOFILE=65535
-RestartSec=2s
+ExecStart={{ gitea.lookup.paths.bin | path_join("gitea") }} web --config '{{ gitea.lookup.paths.conf | path_join("app.ini") }}'
+Environment=USER={{ gitea.lookup.user }} HOME={{ gitea.lookup.paths.work }} GITEA_WORK_DIR={{ gitea.lookup.paths.work }}
+                 {%- if needs_custom %} GITEA_CUSTOM={{ gitea.lookup.paths.custom }}{%- endif %}
+
+# Process management
+####################
 Type=simple
-User={{ user }}
-Group={{ gitea.lookup.group }}
-WorkingDirectory={{ work }}
-# If using Unix socket: tells systemd to create the /run/gitea folder, which will contain the gitea.sock file
-# (manually creating /run/gitea doesn't work, because it would not persist across reboots)
-#RuntimeDirectory=gitea
-ExecStart={{ bin }} web --config '{{ config }}'
 Restart=always
-Environment=USER={{ user }} HOME={{ home }} GITEA_WORK_DIR={{ work }}{% if custom_needed %} GITEA_CUSTOM={{ custom }}{% endif %}
-# If you install Git to directory prefix other than default PATH (which happens
-# for example if you install other versions of Git side-to-side with
-# distribution version), uncomment below line and add that prefix to PATH
-# Don't forget to place git-lfs binary on the PATH below if you want to enable
-# Git LFS support
-#Environment=PATH=/path/to/git/bin:/bin:/sbin:/usr/bin:/usr/sbin
-# If you want to bind Gitea to a port below 1024, uncomment
-# the two values below, or use socket activation to pass Gitea its ports as above
-###
-#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-#AmbientCapabilities=CAP_NET_BIND_SERVICE
-###
+RestartSec=2s
+
+# Directory creation and permissions
+####################################
+User={{ gitea.lookup.user }}
+Group={{ gitea.lookup.group }}
+WorkingDirectory={{ gitea.lookup.paths.work }}
+{%- if "unix" in gitea.config | traverse("server:protocol", "") %}
+RuntimeDirectory=gitea
+{%- endif %}
+
+{%- if "file" in gitea.config | traverse("log:mode", "console") %}
+{%-   if "/var/log/gitea" == gitea.lookup.paths.log %}
+LogsDirectory=gitea
+{%-   else %}
+{%-     do rw.append(gitea.lookup.paths.log) %}
+{%-   endif %}
+{%- endif %}
+
+{%- if "/var/lib/gitea" == gitea.lookup.paths.work %}
+StateDirectory=gitea
+{%- else %}
+{%-   do rw.append(gitea.lookup.paths.work) %}
+{%- endif %}
+ReadWritePaths={{ rw | join(" ") }}
+
+# Hardening measures
+####################
+# https://wiki.archlinux.org/title/Gitea#Binding_on_restricted_ports
+AmbientCapabilities={{ "CAP_NET_BIND_SERVICE" if needs_port_cap }}
+CapabilityBoundingSet={{ "CAP_NET_BIND_SERVICE" if needs_port_cap }}
+PrivateUsers={{ (not needs_port_cap) | string | lower }}
+LockPersonality=true
+# Required by commit search
+#MemoryDenyWriteExecute=true
+NoNewPrivileges=True
+#SecureBits=noroot-locked
+PrivateDevices=true
+PrivateTmp=true
+ProtectClock=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectProc=invisible
+ProtectSystem=strict
+RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX
+RestrictNamespaces=true
+RestrictRealtime=true
+RestrictSUIDSGID=true
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallErrorNumber=EPERM
 
 [Install]
 WantedBy=multi-user.target
diff --git a/gitea/parameters/defaults.yaml b/gitea/parameters/defaults.yaml
index 5bb8149..d8962ac 100644
--- a/gitea/parameters/defaults.yaml
+++ b/gitea/parameters/defaults.yaml
@@ -15,14 +15,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -62,6 +62,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   # Just here for testing
diff --git a/gitea/post-map.jinja b/gitea/post-map.jinja
index 6386a98..783dd78 100644
--- a/gitea/post-map.jinja
+++ b/gitea/post-map.jinja
@@ -14,13 +14,16 @@
 
 
 {#-
-    If paths are different than default, they need to be specified in the config.
+    If paths are different than default, they need to be specified in the config and the service
+    needs to grant read/write permissions.
     CUSTOM_PATH and WORKDIR are environment variables.
     I'm not sure about `log` tbh. Per the official docs, the default is empty.
     This might cause duplicate entries if the user did not specify in all-lowercase.
     Also, it will not overwrite custom configuration, which might make the installation fail.
 -#}
 
+{%- do mapdata.update({"_rw": []}) -%}
+
 {%- for path in [
       ('app_data_path', 'server', mapdata.lookup.paths.data, mapdata.lookup.paths.work | path_join('data')),
       ('root_path', 'log', mapdata.lookup.paths.log, mapdata.lookup.paths.work | path_join('log')),
@@ -29,6 +32,10 @@
   {%- set var, topic, current, default = path -%}
   {%- if current != default -%}
     {%- do mapdata | update_dict_key_value('config:' ~ topic, {var: current}) -%}
+    {#- log directory is handled in service template -#}
+    {%- if topic != 'log' -%}
+      {%- do mapdata._rw.append(current) -%}
+    {%- endif -%}
   {%- endif -%}
 {%- endfor -%}
 
@@ -63,3 +70,25 @@
     {%- do mapdata.secrets.update({jwt: secret}) -%}
   {%- endif -%}
 {%- endfor -%}
+
+{#-
+    Automatically configure the socket path to use the one provided by Systemd.
+-#}
+
+{%- if "unix" in mapdata.config | traverse("server:protocol", "") -%}
+  {%- do mapdata.config.server.update({"http_addr": "/run/gitea/gitea.socket"}) -%}
+{%- endif -%}
+
+{#-
+    Automatically configure basic service dependencies.
+    Memcached/Redis are not as easy to discover (multiple settings)
+    and therefore need to be provided manually.
+-#}
+
+{%- if mapdata.config | traverse("database:db_type", "mysql") in ["mysql", "postgres", "mssql"] -%}
+  {%- set db_type = mapdata.config | traverse("database:db_type", "mysql") -%}
+  {%- if db_type not in mapdata.service.wants -%}
+    {#- MariaDB usually provides `mysql.service` as well. -#}
+    {%- do mapdata.service.wants.append(db_type) -%}
+  {%- endif -%}
+{%- endif -%}
diff --git a/pillar.example b/pillar.example
index d8e7e50..7d07036 100644
--- a/pillar.example
+++ b/pillar.example
@@ -30,11 +30,15 @@ gitea:
 
     # Service configuration allows to request mount paths or
     # other service units. This is especially important if you
-    # run a local database server. Example: If you run mariadb
-    # on localhost, specify wants: ['mariadb'] (or however the
-    # unit is called, without `.service` suffix).
+    # run Memcached/Redis. For databases, `post-map.jinja` appends
+    # the database type automatically.
+    # Example: If you run Redis on localhost, specify
+    # wants: ['redis'] (or however the unit is called, without `.service` suffix).
   service:
     requires_mount: []
+      # This is intended to setup socket activation. It is currently a draft
+      # and not functional.
+    socket_activation: false
     wants: []
 
     # This is the custom configuration. Values in `default` are dumped
@@ -72,14 +76,14 @@ gitea:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb
index 086583e..6c097b1 100644
--- a/test/integration/default/controls/config.rb
+++ b/test/integration/default/controls/config.rb
@@ -3,7 +3,7 @@
 control 'gitea.config.file' do
   title 'Verify the configuration file'
 
-  describe file('/var/opt/gitea/custom/conf/app.ini') do
+  describe file('/etc/gitea/app.ini') do
     it { should be_file }
     it { should be_owned_by 'root' }
     it { should be_grouped_into 'root' }
diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
index ee8703f..74258c0 100644
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
index b59d0eb..dd60846 100644
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
index 5597601..a44f6c8 100644
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml
index 643a425..b0a0916 100644
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml
index 7e52f9f..ac8cb20 100644
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
index c04bdbf..e687bbf 100644
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
index 0dcbab8..5bc6b56 100644
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
index fd6b3f2..a6500d4 100644
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
index c55f04d..34f25c8 100644
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
index a086c65..2e5bc23 100644
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml
index f0ea950..2bf6e02 100644
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
index a6b455f..b2cf52f 100644
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
index ab89704..af0ea19 100644
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
index 845af76..935085e 100644
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml
index d9bcf2f..4cdf333 100644
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml
index ac418fa..9246994 100644
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
index 29d0413..d020397 100644
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
index 29d0413..d020397 100644
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
index 5b29b20..1283680 100644
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
index 5ac4bbc..7a3e544 100644
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
index 7596cb4..5555545 100644
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
index 4a9f1b6..cf4eacf 100644
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml
index 7136840..c3dc46d 100644
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
index 47eac1b..9535e1b 100644
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
index 99eb657..2591956 100644
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
index c032072..ac60eda 100644
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -8,7 +8,7 @@ values:
   lookup:
     arch: amd64
     rootgroup: root
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -17,14 +17,14 @@ values:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -64,6 +64,7 @@ values:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
   map_jinja:
diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
index 6c96b47..4f8ac49 100644
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -7,7 +7,7 @@ gitea:
     # Just for testing purposes
     winner: lookup
     added_in_lookup: lookup_value
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -16,14 +16,14 @@ gitea:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -63,6 +63,7 @@ gitea:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest
 
diff --git a/test/salt/pillar/upstart.sls b/test/salt/pillar/upstart.sls
index 6c96b47..4f8ac49 100644
--- a/test/salt/pillar/upstart.sls
+++ b/test/salt/pillar/upstart.sls
@@ -7,7 +7,7 @@ gitea:
     # Just for testing purposes
     winner: lookup
     added_in_lookup: lookup_value
-    config: '/var/opt/gitea/custom/conf/app.ini'
+    config: '/etc/gitea/app.ini'
     service:
       name: gitea
     gpg:
@@ -16,14 +16,14 @@ gitea:
     group: git
     paths:
       bin: /opt/gitea
-      conf: /etc/opt/gitea
-      custom: /var/opt/gitea/custom
-      data: /var/opt/gitea/data
-      home: /var/opt/gitea/home
-      internal_token_uri: file:///etc/opt/gitea/internal_token
-      log: /var/opt/gitea/log
-      repos: /var/opt/gitea/data/gitea-repositories
-      work: /var/opt/gitea
+      conf: /etc/gitea
+      custom: /var/lib/gitea/custom
+      data: /var/lib/gitea/data
+      home: /var/lib/gitea/home
+      internal_token_uri: file:///etc/gitea/internal_token
+      log: /var/log/gitea
+      repos: /var/lib/gitea/data/gitea-repositories
+      work: /var/lib/gitea
     pkg:
       latest: https://dl.gitea.io/gitea/version.json
       sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
@@ -63,6 +63,7 @@ gitea:
     secret_key: ''
   service:
     requires_mount: []
+    socket_activation: false
     wants: []
   version: latest