smeserver-git/contribs10/smeserver-git-1.2.0.bz10464-warn-on-missing-files.patch

diff -Nur smeserver-git-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories smeserver-git-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
--- smeserver-git-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories 2017-11-28 17:50:06.000000000 -0500
+++ smeserver-git-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories     2017-11-28 18:41:51.662000000 -0500
@@ -130,12 +130,14 @@
         $GitWebCSS  = "";
       }
       else {
-        die "Gitweb is enabled in /usr/share/gitweb, but could not find 'gitweb.css'!\n";
+       $gitweb_theme="disabled";
+        warn "Gitweb is enabled in /usr/share/gitweb, but could not find 'gitweb.css'!Please install smeserver-gitweb-theme if you need it.\n";
       }
     }
     elsif( -e "/var/www/git/gitweb.cgi" ) { 
       # Git 1.8+
       $GitWebRoot = "/var/www/git";
+      # check if smeserver-gitweb-theme is installed
       if( -e "/var/www/git/static/gitweb.css" ) { 
         $GitWebCSS  = "/static";
       }  
@@ -143,11 +145,13 @@
         $GitWebCSS  = "";
       }
       else {
-        die "Gitweb is enabled in /var/www/git, but could not find 'gitweb.css'!\n";
+       $gitweb_theme="disabled";       
+        warn "Gitweb is enabled in /var/www/git, but could not find 'gitweb.css'! Please install smeserver-gitweb-theme if you need it.\n";
       }
     }
     else {
-      die "Gitweb is enabled, but could not find 'gitweb.cgi'!\n";
+      $gitweb="disabled";
+      warn "Gitweb is enabled in your configuration, but could not find 'gitweb.cgi'! Considering it as disabled. Please install smeserver-gitweb if you need it.\n";
     }
   }
 
1	brianr	1.1	diff -Nur smeserver-git-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories smeserver-git-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
2			--- smeserver-git-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories 2017-11-28 17:50:06.000000000 -0500
3			+++ smeserver-git-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories 2017-11-28 18:41:51.662000000 -0500
4			@@ -130,12 +130,14 @@
5			$GitWebCSS = "";
6			}
7			else {
8			- die "Gitweb is enabled in /usr/share/gitweb, but could not find 'gitweb.css'!\n";
9			+ $gitweb_theme="disabled";
10			+ warn "Gitweb is enabled in /usr/share/gitweb, but could not find 'gitweb.css'!Please install smeserver-gitweb-theme if you need it.\n";
11			}
12			}
13			elsif( -e "/var/www/git/gitweb.cgi" ) {
14			# Git 1.8+
15			$GitWebRoot = "/var/www/git";
16			+ # check if smeserver-gitweb-theme is installed
17			if( -e "/var/www/git/static/gitweb.css" ) {
18			$GitWebCSS = "/static";
19			}
20			@@ -143,11 +145,13 @@
21			$GitWebCSS = "";
22			}
23			else {
24			- die "Gitweb is enabled in /var/www/git, but could not find 'gitweb.css'!\n";
25			+ $gitweb_theme="disabled";
26			+ warn "Gitweb is enabled in /var/www/git, but could not find 'gitweb.css'! Please install smeserver-gitweb-theme if you need it.\n";
27			}
28			}
29			else {
30			- die "Gitweb is enabled, but could not find 'gitweb.cgi'!\n";
31			+ $gitweb="disabled";
32			+ warn "Gitweb is enabled in your configuration, but could not find 'gitweb.cgi'! Considering it as disabled. Please install smeserver-gitweb if you need it.\n";
33			}
34			}
35