Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
I
ISPConfig 3
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 1,574
    • Issues 1,574
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • ISPConfig
  • ISPConfig 3
  • Merge Requests
  • !794

Open
Opened Jun 13, 2018 by Óscar Marcos@Funclineal1
  • Report abuse
Report abuse

Added Version control plugin

What is this for?

This plugin integrates Git repositories for the ISPConfig Sites.

You have the option to 'git clone' a repository on the %document_root%/web folder of the websites. The first time you add the repo it tries to 'git clone'-it creating a temporal folder in /tmp/web_git/[web_git_id]/. After the clone, it changes permissions to every file with the user and group of the website. Then it moves all the content to the %document_root%/web folder.

Every time you change the values of a repository (via ISPConfig form) it checks if there is a git repository created in the folder. If not, it tries to clone it. If yes, performs a 'git pull' and changes and chowns all the web folder.

'git pull' log is stored and can be viewed inside a Git repository register.

#Enable module and plugin
ln -s /usr/local/ispconfig/server/mods-available/vcs_module.inc.php /usr/local/ispconfig/server/mods-enabled/vcs_module.inc.php
ln -s /usr/local/ispconfig/server/plugins-available/vcs_plugin.inc.php /usr/local/ispconfig/server/plugins-enabled/vcs_plugin.inc.php
Edited Jul 16, 2018 by Marius Burkard

Check out, review, and merge locally

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

git fetch "https://git.ispconfig.org/Funclineal/ispconfig3.git" "master"
git checkout -b "Funclineal/ispconfig3-master" 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 "Funclineal/ispconfig3-master"

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 7
  • Commits 6
  • Changes 16
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: ispconfig/ispconfig3!794