[Gforge-commits] gforge setup,1.35,1.36

[cbayle]

Update of /cvsroot/gforge/gforge
In directory db.perdue.net:/tmp/cvs-serv2027

Modified Files:
        setup 
Log Message:
Added a function to calculate key and crt files so this should
be able to work for all distro


Index: setup
===================================================================
RCS file: /cvsroot/gforge/gforge/setup,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- setup       25 Oct 2004 14:39:51 -0000      1.35
+++ setup       27 Oct 2004 22:16:08 -0000      1.36
@@ -95,8 +95,8 @@
        DEFAULTsys_localinc=$ETCDIR/local.inc
        DEFAULTsys_jabber_pass=$(dd if=/dev/urandom count=256 bs=1 2> /dev/null 
| md5sum | cut -b1-8)
        DEFAULTsys_plugins_path=/usr/lib/gforge/plugins/
-       DEFAULTsys_sslcrt=/etc/apache/ssl.crt/server.crt
-       DEFAULTsys_sslkey=/etc/apache/ssl.key/server.key
+       DEFAULTsys_sslcrt=$(findkey)
+       DEFAULTsys_sslkey=$(findcrt)
        #
        # TODO
        #usr_lib_gforge=$GFGDIR
@@ -104,6 +104,29 @@
        #docdir
 }
 
+findcrt(){
+       if [ -f /etc/apache2/ssl/apache.pem ]
+       then
+               echo /etc/apache2/ssl/apache.pem
+       else
+               if [ -f /etc/apache/ssl.crt/server.crt ]
+               then 
+                       echo /etc/apache/ssl.crt/server.crt
+               fi
+       fi
+}
+findkey(){
+       if [ -f /etc/apache2/ssl/apache.pem ]
+       then
+               echo /etc/apache2/ssl/apache.pem
+       else
+               if [ -f /etc/apache/ssl.key/server.crt ]
+               then 
+                       echo /etc/apache/ssl.key/server.key
+               fi
+       fi
+}
+
 writedefault(){
        # Here is the fun
        # This create a default conf file in $1