Release 13.10.2 - See CHANGELOG.md

Author: tiredofit

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 13.10.2 2021-03-27 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add more EE Cronjobs
+
+   ### Changed
+      - Fix Mailroom from not starting and failing incoming mail
+
+
 ## 13.10.0 2021-03-23 <dave at tiredofit dot ca>
 
    ### Added

install/assets/defaults/20-gitlab

@@ -287,16 +287,17 @@ IMAP_USER=${IMAP_USER:-}
 IMAP_PASS=${IMAP_PASS:-}
 IMAP_SSL=${IMAP_SSL:-true}
 IMAP_STARTTLS=${IMAP_STARTTLS:-false}
-IMAP_MAILBOX=${IMAP_MAILBOX:-inbox}
+IMAP_MAILBOX=${IMAP_MAILBOX:-Inbox}
 IMAP_TIMEOUT=${IMAP_TIMEOUT:-60}
 
-if [[ -n ${IMAP_USER} ]]; then
+if [ -n ${IMAP_USER} ]; then
   IMAP_ENABLED=${IMAP_ENABLED:-true}
+  GITLAB_INCOMING_EMAIL_ENABLED=${GITLAB_INCOMING_EMAIL_ENABLED:-true}
 fi
+
 IMAP_ENABLED=${IMAP_ENABLED:-false}
 GITLAB_INCOMING_EMAIL_ENABLED=${GITLAB_INCOMING_EMAIL_ENABLED:-${IMAP_ENABLED}}
-GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS:-${IMAP_USER}}
-GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS:[email protected]}
+GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS:-"[email protected]"}
 
 ## LDAP
 LDAP_ENABLED=${LDAP_ENABLED:-false}

install/assets/functions/20-gitlab

@@ -384,6 +384,9 @@ gitlab_configure_mailroom() {
   rm -rf /etc/services.available/60-mailroom/run
   mv /etc/services.available/60-mailroom/run.tmp /etc/services.available/60-mailroom/run
   chmod +x /etc/services.available/60-mailroom/run
+  # In case it fails
+  #echo "* * * * * 'cd /home/git/gitlab; sudo -HEu buncle exec rake gitlab:incoming_email:check" >> /assets/cron/crontab.txt
+
 }
 
 gitlab_configure_ldap() {
@@ -1654,7 +1657,7 @@ check_service_initialized 50-workhorse
 liftoff
 
 print_info "Starting Gitlab Pages ${GITLAB_PAGES_VERSION}"
-exec s6-setuidgid git /usr/local/bin/gitlab-pages -pages-domain ${GITLAB_PAGES_DOMAIN} -pages-root ${GITLAB_PAGES_DIR} -listen-proxy :8090 \\
+exec sudo -HEu git /usr/local/bin/gitlab-pages -pages-domain ${GITLAB_PAGES_DOMAIN} -pages-root ${GITLAB_PAGES_DIR} -listen-proxy :8090 \\
 EOF
 
   if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then

install/assets/gitlab/config/gitlabhq/gitlab.yml

@@ -159,6 +159,8 @@ production: &base
     # The mailbox where incoming mail will end up. Usually "inbox".
     mailbox: "{{IMAP_MAILBOX}}"
 
+    log_path: "log/mail_room_json.log"
+
     # The IDLE command timeout.
     idle_timeout: {{IMAP_TIMEOUT}}
 
@@ -290,22 +292,38 @@ production: &base
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
   # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
   cron_jobs:
-    # Flag stuck CI jobs as failed
+   # Flag stuck CI jobs as failed
     stuck_ci_jobs_worker:
       cron: "0 * * * *"
     # Execute scheduled triggers
     pipeline_schedule_worker:
-      cron: "{{GITLAB_PIPELINE_SCHEDULE_WORKER_CRON}}"
+      cron: "3-59/10 * * * *"
     # Remove expired build artifacts
     expire_build_artifacts_worker:
-      cron: "50 * * * *"
+      cron: "*/7 * * * *"
+    # Remove expired pipeline artifacts
+    ci_pipelines_expire_artifacts_worker:
+      cron: "*/23 * * * *"
+    # Remove files from object storage
+    ci_schedule_delete_objects_worker:
+      cron: "*/16 * * * *"
+    # Stop expired environments
+    environments_auto_stop_cron_worker:
+      cron: "24 * * * *"
     # Periodically run 'git fsck' on all repositories. If started more than
     # once per hour you will have concurrent 'git fsck' jobs.
     repository_check_worker:
       cron: "20 * * * *"
+    # Archive live traces which have not been archived yet
+    ci_archive_traces_cron_worker:
+      cron: "17 * * * *"
     # Send admin emails once a week
     admin_email_worker:
       cron: "0 0 * * 0"
+    # Send emails for personal tokens which are about to expire
+    personal_access_tokens_expiring_worker:
+      cron: "0 1 * * *"
+
     # Remove outdated repository archives
     repository_archive_cache_worker:
       cron: "0 * * * *"
@@ -314,8 +332,20 @@ production: &base
     pages_domain_verification_cron_worker:
       cron: "*/15 * * * *"
 
-    ##
-    # GitLab EE only jobs:
+    # Periodically migrate diffs from the database to external storage
+    schedule_migrate_external_diffs_worker:
+      cron: "15 * * * *"
+
+    # Update CI Platform Metrics daily
+    ci_platform_metrics_update_cron_worker:
+      cron: "47 9 * * *"
+
+  # GitLab EE only jobs. These jobs are automatically enabled for an EE
+  # installation, and ignored for a CE installation.
+  ee_cron_jobs:
+    # Schedule snapshots for all devops adoption segments
+    analytics_devops_adoption_create_all_snapshots_worker:
+      cron: 0 4 * * *
 
     # Snapshot active users statistics
     historical_data_worker:
@@ -327,6 +357,11 @@ production: &base
     ldap_sync_worker:
       cron: "30 1 * * *"
 
+    # Periodically refresh LDAP groups membership.
+    # NOTE: This will only take effect if LDAP is enabled
+    ldap_group_sync_worker:
+      cron: "0 * * * *"
+
     # GitLab Geo metrics update worker
     # NOTE: This will only take effect if Geo is enabled
     geo_metrics_update_worker:
@@ -335,18 +370,47 @@ production: &base
     # GitLab Geo prune event log worker
     # NOTE: This will only take effect if Geo is enabled (primary node only)
     geo_prune_event_log_worker:
-      cron: "0 */6 * * *"
+      cron: "*/5 * * * *"
 
     # GitLab Geo repository sync worker
     # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
     geo_repository_sync_worker:
       cron: "*/1 * * * *"
 
+    # GitLab Geo registry backfill worker
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    geo_secondary_registry_consistency_worker:
+      cron: "* * * * *"
+
     # GitLab Geo file download dispatch worker
     # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
     geo_file_download_dispatch_worker:
       cron: "*/1 * * * *"
 
+    # GitLab Geo registry sync worker (for backfilling)
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    geo_registry_sync_worker:
+      cron: "*/1 * * * *"
+
+    # Export pseudonymized data in CSV format for analysis
+    pseudonymizer_worker:
+      cron: "0 * * * *"
+
+    # Elasticsearch bulk updater for incremental updates.
+    # NOTE: This will only take effect if elasticsearch is enabled.
+    elastic_index_bulk_cron_worker:
+      cron: "*/1 * * * *"
+
+    # Elasticsearch bulk updater for initial updates.
+    # NOTE: This will only take effect if elasticsearch is enabled.
+    elastic_index_initial_bulk_cron_worker:
+      cron: "*/1 * * * *"
+
+    # Elasticsearch reindexing worker
+    # NOTE: This will only take effect if elasticsearch is enabled.
+    elastic_index_initial_bulk_cron_worker:
+      cron: "*/10 * * * *"
+
   registry:
     enabled: {{GITLAB_REGISTRY_ENABLED}}
     host: {{GITLAB_REGISTRY_HOST}}

install/etc/cont-init.d/20-gitlab

@@ -17,10 +17,10 @@ case "$MODE" in
             "START")
                 migrate_database
                 ### Enable / Disable Services
-                if var_true $GITLAB_INCOMING_MAIL_ENABLED ; then
-                    print_notice "Enabling Mailroom"
-                else
+                if var_false $IMAP_ENABLED ; then
                     service_stop 60-mailroom
+                else
+                    print_notice "Enabling Mailroom"
                 fi
 
                 if var_true $GITLAB_PAGES_ENABLED ; then

install/etc/services.available/60-mailroom/run

@@ -12,4 +12,4 @@ print_info "Starting Mailroom"
 HOME=${GITLAB_HOME}
 
 cd "${GITLAB_INSTALL_DIR}"
-silent sudo -HEu git bundle exec mail_room ${GITLAB_INSTALL_DIR}/config/mail_room.yml
+silent sudo -HEu git bundle exec mail_room -c ${GITLAB_INSTALL_DIR}/config/mail_room.yml