[Dspace-tech] git workflow with DSpace 1.8

2012-06-08 Thread Alan Orth
Hey, all.

In the past my git-based DSpace workflow was this: our DSpace git 
repository had 'development' and 'production' branches, and I maintained 
two config files, dev_dspace.cfg and prod_dspace.cfg.  When redeploying 
my web apps I simply specified which config I want to use, for example:

sudo ant -Dconfig=../../prod_dspace.cfg update

This made it easy to maintain one code base for different environments, 
as well as keeping our configuration changes out of git; keeping our 
changes outside of dspace.cfg makes it easier to merge patches from 
DSpace master, as well as have less headaches between dev/prod environments.

With DSpace 1.8 the main DSpace config file has been split into several 
subsections and my workflow is now broken.  Not only do my changes 
diverge from upstream, I can't maintain dev/prod configs in one code 
base.  I could commit my config changes to git, but then I'd have to 
worry about passwords and other internal information getting into our 
public github.  I could maintain two separate git checkouts, but that 
seems like a waste.  Trying to establish the path of least resistance, 
some sort of a balance between ease of use and git-admin fu. :)

How are other people handling this?

-- 
Alan Orth
alan.o...@gmail.com
http://alaninkenya.org
http://mjanja.co.ke
I have always wished for my computer to be as easy to use as my 
telephone; my wish has come true because I can no longer figure out how 
to use my telephone. -Bjarne Stroustrup, inventor of C++

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
DSpace-tech mailing list
DSpace-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dspace-tech


Re: [Dspace-tech] git workflow with DSpace 1.8

2012-06-08 Thread helix84
On Fri, Jun 8, 2012 at 1:23 PM, Alan Orth alan.o...@gmail.com wrote:
 How are other people handling this?

I'm sorry if my simple answer will let you down, but I manually copy
over a config directory with local customizations after each ant
update. This directory contains only the files that are customized and
I have to watch for any added config parameters in new versions (I
guess one has to do that in every case).

Regards,
~~helix84

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
DSpace-tech mailing list
DSpace-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dspace-tech


Re: [Dspace-tech] git workflow with DSpace 1.8

2012-06-08 Thread helix84
On Fri, Jun 8, 2012 at 2:44 PM, Alan Orth alan.o...@gmail.com wrote:
 Helix,

 Yeah, I could do that.  Maybe something something like dev_modules and
 prod_modules.

 I wonder how hard it would be to add an option ant's build script which
 allowed for the specification of a custom modules location.  Maybe
 something like:

        -Dmodules=../../config/prod_modules
 -Dconfig=../../config/prod_dspace.cfg

 It seems like this might be a useful feature, much like the -Dconfig option.

 Cheers,

 Alan

I'm copying your answer back to dspace-tech.

Yes, I think it's a logical complement to -Dconfig. Although I
personally don't use it, it might be interesting for others, so if you
manage to get it working, be sure to post a patch to the tracker:

https://jira.duraspace.org/browse/

Regards,
~~helix84

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
DSpace-tech mailing list
DSpace-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dspace-tech


Re: [Dspace-tech] git workflow with DSpace 1.8

2012-06-08 Thread Alan Orth
Helix,

Oops, thanks for CC'ing the list.

I'm a rubbish programmer, but I might take a look at this kind of 
functionality.  Or maybe Tim/Peter/etc might decide this feature is 
really useful and take it up on their own ;).

Alan

On 06/08/2012 03:49 PM, helix84 wrote:
 On Fri, Jun 8, 2012 at 2:44 PM, Alan Orth alan.o...@gmail.com wrote:
 Helix,

 Yeah, I could do that.  Maybe something something like dev_modules and
 prod_modules.

 I wonder how hard it would be to add an option ant's build script which
 allowed for the specification of a custom modules location.  Maybe
 something like:

 -Dmodules=../../config/prod_modules
 -Dconfig=../../config/prod_dspace.cfg

 It seems like this might be a useful feature, much like the -Dconfig option.

 Cheers,

 Alan

 I'm copying your answer back to dspace-tech.

 Yes, I think it's a logical complement to -Dconfig. Although I
 personally don't use it, it might be interesting for others, so if you
 manage to get it working, be sure to post a patch to the tracker:

 https://jira.duraspace.org/browse/

 Regards,
 ~~helix84


-- 
Alan Orth
alan.o...@gmail.com
http://alaninkenya.org
http://mjanja.co.ke
I have always wished for my computer to be as easy to use as my 
telephone; my wish has come true because I can no longer figure out how 
to use my telephone. -Bjarne Stroustrup, inventor of C++



--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
DSpace-tech mailing list
DSpace-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dspace-tech