Remove php4 support Good riddance

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index c97a2ad..801772b 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -62,7 +62,7 @@ fun backupLogDirOf version1 =
     else
        "/afs/hcoop.net/common/etc/domtool/backup/apache2/"
 
     else
        "/afs/hcoop.net/common/etc/domtool/backup/apache2/"
 

-val defaultPhpVersion = 4
+val defaultPhpVersion = 5

 
 val waklogUserFile = "/var/domtool/waklog.conf"
 
 
 val waklogUserFile = "/var/domtool/waklog.conf"
 

diff --git a/lib/apache.dtl b/lib/apache.dtl
index 98dca55..c8fc51c 100644 (file)
--- a/lib/apache.dtl
+++ b/lib/apache.dtl
@@ -34,7 +34,6 @@ extern val no_ssl : ssl;
 extern val use_cert : ssl_cert_path -> ssl;
 
 extern type php_version;
 extern val use_cert : ssl_cert_path -> ssl;
 
 extern type php_version;

-extern val php4 : php_version;

 extern val php5 : php_version;
 
 extern val vhost : host -> Vhost => [Domain]
 extern val php5 : php_version;
 
 extern val vhost : host -> Vhost => [Domain]

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index d53d687..52470c8 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -167,7 +167,7 @@ val defaults = [("WebPlaces",
                 (fn () => (EVar "true", dl))),
                ("PhpVersion",
                 (TBase "php_version", dl),
                 (fn () => (EVar "true", dl))),
                ("PhpVersion",
                 (TBase "php_version", dl),

-                (fn () => (EVar "php4", dl)))]
+                (fn () => (EVar "php5", dl)))]

 
 val () = app Defaults.registerDefault defaults
 
 
 val () = app Defaults.registerDefault defaults
 


@@ -486,8 +486,7 @@ fun vhostPost () = (!post ();
                    write "</VirtualHost>\n";
                    app (TextIO.closeOut o #2) (!vhostFiles))
 
                    write "</VirtualHost>\n";
                    app (TextIO.closeOut o #2) (!vhostFiles))
 

-val php_version = fn (EVar "php4", _) => SOME 4
-                  | (EVar "php5", _) => SOME 5
+val php_version = fn (EVar "php5", _) => SOME 5

                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =