v17.0

Author: qq7

conf.d/main

@@ -33,6 +33,11 @@ sed -i "/gitlab_rails\['gitlab_email_subject_suffix'\]/ s|=.*|= '\[$APP_NAME\]'|
 # set up GitLab
 export LC_ALL=C.UTF-8 # explicitly set UTF8 to avoid GitLab bitchin...
 service gitlab-runsvdir start
+sleep 1
+
+# https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/3552#note_88614190
+touch /.dockerenv
+
 gitlab-ctl reconfigure
 
 # disable GitLab WebUI prompting to set 'root' GitLab user password (TurnKey
@@ -63,6 +68,7 @@ sed -i "/postgresql\['dynamic_shared_memory_type'\]/ s|= 'mmap'|= nil|" $CONF
 sed -i "/postgresql\['shared_buffers'\]/ s|^|# |" $CONF
 sed -i "/postgresql\['shared_buffers'\]/ s|=.*|= \"256MB\"|" $CONF
 
+rm /.dockerenv
 service gitlab-runsvdir stop
 # ensure that the overlay turnkey service is the one that is enabled
 systemctl disable gitlab-runsvdir.service

overlay/etc/apt/sources.list.d/gitlab-ce.list

@@ -1,5 +1,5 @@
 # this file was created by TurnKey Linux for use with the
 # repository at https://packages.gitlab.com/gitlab/gitlab-ce
 
-deb [signed-by=/usr/share/keyrings/gitlab-ce.gpg] https://packages.gitlab.com/gitlab/gitlab-ce/debian/ buster main
-deb-src [signed-by=/usr/share/keyrings/gitlab-ce.gpg] https://packages.gitlab.com/gitlab/gitlab-ce/debian/ buster main
+deb [signed-by=/usr/share/keyrings/gitlab-ce.gpg] https://packages.gitlab.com/gitlab/gitlab-ce/debian/ bullseye main
+deb-src [signed-by=/usr/share/keyrings/gitlab-ce.gpg] https://packages.gitlab.com/gitlab/gitlab-ce/debian/ bullseye main

overlay/etc/incron.allow

@@ -1 +0,0 @@
-root

overlay/usr/lib/confconsole/plugins.d/Lets_Encrypt/get_certificate.py

@@ -7,7 +7,7 @@
 # import inithooks_cache (from absolute path) for managing domain caching
 import sys
 sys.path.append('/usr/lib/inithooks/bin')
-import inithooks_cache
+from libinithooks import inithooks_cache
 
 LE_INFO_URL = 'https://acme-v02.api.letsencrypt.org/directory'
 

overlay/usr/lib/inithooks/bin/gitlab.py

@@ -11,12 +11,12 @@
 
 import sys
 import getopt
-import inithooks_cache
+from libinithooks import inithooks_cache
 import os
 import pwd
 import subprocess
 
-from dialog_wrapper import Dialog
+from libinithooks.dialog_wrapper import Dialog
 
 
 def usage(s=None):

plan/main

@@ -1,4 +1,3 @@
 #include <turnkey/base>
 
 sudo
-incron      /* To update TasksMax in TurnKey overlay service */