mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 04:29:28 +01:00
adding missing adLDAP stuff, support for https and ssh checkouts and (un)tagging to .mrconfig
This commit is contained in:
parent
6c927a5a2c
commit
4165c649ae
49
.mrconfig
49
.mrconfig
@ -5,13 +5,23 @@
|
|||||||
|
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
git_update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true
|
git_update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true
|
||||||
|
# run 5 jobs parallel, does NOT work with more then one svn module for (un)tag!
|
||||||
jobs = 5
|
jobs = 5
|
||||||
|
git_tag = git tag -a $1 -m "$2"
|
||||||
|
git_untag = git tag -d $1
|
||||||
|
svn_tag = svn cp --parents -m "$2" $(svn info|grep ^URL|cut -f 2 -d ' ') $(svn info|grep ^URL|cut -f 2 -d ' '|sed -E "s:/(branches/[0-9.]+|trunk)/:/tags/$1/:")
|
||||||
|
svn_untag = svn rm -m "remove tag" $(svn info|grep ^URL|cut -f 2 -d ' '|sed -E "s:/(branches/[0-9.]+|trunk)/.*$:/tags/$1/:")
|
||||||
|
|
||||||
[api/src/Db/ADOdb]
|
[api/src/Db/ADOdb]
|
||||||
checkout = git clone git@github.com:EGroupware/ADOdb.git
|
checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/ADOdb.git
|
||||||
|
|
||||||
|
[api/src/Accounts/Ads]
|
||||||
|
checkout = svn checkout https://svn.code.sf.net/p/adldap/code/trunk/src Ads
|
||||||
|
skip = [ $1 = "tag" -o $1 = "untag" ]
|
||||||
|
|
||||||
[api/js/ckeditor]
|
[api/js/ckeditor]
|
||||||
checkout = svn checkout https://github.com/EGroupware/ckeditor-dev/branches/trunk/dev/builder/release/ckeditor
|
checkout = svn checkout https://github.com/EGroupware/ckeditor-dev/branches/trunk/dev/builder/release/ckeditor
|
||||||
|
skip = [ $1 = "tag" -o $1 = "untag" ]
|
||||||
|
|
||||||
[]
|
[]
|
||||||
# to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
|
# to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
|
||||||
@ -25,63 +35,63 @@ update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null
|
|||||||
###
|
###
|
||||||
[activesync]
|
[activesync]
|
||||||
# synchronise mobile phone via Z-Push and ActiveSync protocoll
|
# synchronise mobile phone via Z-Push and ActiveSync protocoll
|
||||||
checkout = git clone git@github.com:EGroupware/activesync.git
|
checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/activesync.git
|
||||||
chain = true
|
chain = true
|
||||||
|
|
||||||
[tracker]
|
[tracker]
|
||||||
# tracking or helpdesk application
|
# tracking or helpdesk application
|
||||||
checkout = git clone git@github.com:EGroupware/tracker.git
|
checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/tracker.git
|
||||||
|
|
||||||
[projectmanager]
|
[projectmanager]
|
||||||
# projectmanagement and Ganttcharts
|
# projectmanagement and Ganttcharts
|
||||||
checkout = git clone git@github.com:EGroupware/projectmanager.git
|
checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/projectmanager.git
|
||||||
|
|
||||||
#[bookmarks]
|
#[bookmarks]
|
||||||
# record and share bookmarks
|
# record and share bookmarks
|
||||||
#checkout = git clone git@github.com:EGroupware/bookmarks.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/bookmarks.git
|
||||||
|
|
||||||
#[news_admin]
|
#[news_admin]
|
||||||
# publish and agregate RSS or ATOM feeds
|
# publish and agregate RSS or ATOM feeds
|
||||||
#checkout = git clone git@github.com:EGroupware/news_admin.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/news_admin.git
|
||||||
|
|
||||||
|
#[registration]
|
||||||
|
# allows (after configuration!) to selfregister accounts and recover lost passwords
|
||||||
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/registration.git
|
||||||
|
|
||||||
###
|
###
|
||||||
### Older apps requiring to install phpgwapi and etemplate!
|
### Older apps requiring to install phpgwapi and etemplate!
|
||||||
###
|
###
|
||||||
#[phpgwapi]
|
#[phpgwapi]
|
||||||
# old api used by non 16.1 apps
|
# old api used by non 16.1 apps
|
||||||
#checkout = git clone git@github.com:EGroupware/phpgwapi.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/phpgwapi.git
|
||||||
|
|
||||||
#[jdots]
|
#[jdots]
|
||||||
# alternative "Stylite" template set
|
# alternative "Stylite" template set
|
||||||
#checkout = git clone git@github.com:EGroupware/jdots.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/jdots.git
|
||||||
|
|
||||||
#[etemplate]
|
#[etemplate]
|
||||||
# old templating system superseeded by eTemplate2 in 16.1+ api
|
# old templating system superseeded by eTemplate2 in 16.1+ api
|
||||||
#checkout = git clone git@github.com:EGroupware/etemplate.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/etemplate.git
|
||||||
|
|
||||||
#[registration]
|
|
||||||
# allows (after configuration!) to selfregister accounts and recover lost passwords
|
|
||||||
#checkout = git clone git@github.com:EGroupware/registration.git
|
|
||||||
|
|
||||||
#[phpbrain]
|
#[phpbrain]
|
||||||
# knowledge base
|
# knowledge base
|
||||||
#checkout = git clone git@github.com:EGroupware/phpbrain.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/phpbrain.git
|
||||||
|
|
||||||
#[wiki]
|
#[wiki]
|
||||||
# wiki application
|
# wiki application
|
||||||
#checkout = git clone git@github.com:EGroupware/wiki.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/wiki.git
|
||||||
|
|
||||||
#[sambaadmin]
|
#[sambaadmin]
|
||||||
# keeps passwords in sync with Samba3 using same LDAP as EGroupware (for Samba4 use Active Directory)
|
# keeps passwords in sync with Samba3 using same LDAP as EGroupware (for Samba4 use Active Directory)
|
||||||
#checkout = git clone git@github.com:EGroupware/sambaadmin.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/sambaadmin.git
|
||||||
|
|
||||||
#[sitemgr]
|
#[sitemgr]
|
||||||
# content managment application
|
# content managment application
|
||||||
#checkout = git clone git@github.com:EGroupware/sitemgr.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/sitemgr.git
|
||||||
|
|
||||||
#[phpfreechat]
|
#[phpfreechat]
|
||||||
# chat application
|
# chat application
|
||||||
#checkout = git clone git@github.com:EGroupware/phpfreechat.git
|
#checkout = git clone $(git config --get remote.origin.url|sed 's|/egroupware.git||')/phpfreechat.git
|
||||||
#chain = true
|
#chain = true
|
||||||
|
|
||||||
###
|
###
|
||||||
@ -92,3 +102,6 @@ checkout = git clone git@github.com:EGroupware/projectmanager.git
|
|||||||
|
|
||||||
#[esyncpro]
|
#[esyncpro]
|
||||||
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/esyncpro
|
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/esyncpro
|
||||||
|
|
||||||
|
#[archive]
|
||||||
|
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/archive
|
||||||
|
@ -15,7 +15,7 @@ namespace EGroupware\Api\Accounts;
|
|||||||
|
|
||||||
use EGroupware\Api;
|
use EGroupware\Api;
|
||||||
|
|
||||||
require_once EGW_API_INC.'/adldap/adLDAP.php';
|
require_once __DIR__.'/Ads/adLDAP.php';
|
||||||
use adLDAPException;
|
use adLDAPException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user