Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
slapos
slapos
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 51
    • Merge Requests 51
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • slaposslapos
  • Merge Requests
  • !377

Open
Opened Aug 22, 2018 by Jérome Perrin@jerome
  • Report abuse
Report abuse

WIP: [RFC] erp5: Add entries to access zope directly

For debugging/monitoring (for example ERP5Site_getErrorLogAsRSS) purposes, it can be useful to have entries to directly access a given zope, bypassing haproxy balancer.

This also includes an old patch to actually allow zope to understand ipv6 names in VirtualHostMonster

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/jerome/slapos.git feat/erp5-balancer-direct
git checkout -b jerome/slapos-feat/erp5-balancer-direct FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff jerome/slapos-feat/erp5-balancer-direct

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 21
  • Commits 5
  • Changes 6
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/slapos!377
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号