aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/Makefile2
-rw-r--r--usr.sbin/sade/dispatch.c3
-rw-r--r--usr.sbin/sade/install.c7
-rw-r--r--usr.sbin/sade/menus.c5
-rw-r--r--usr.sbin/sade/sade.h7
-rw-r--r--usr.sbin/sysinstall/Makefile2
-rw-r--r--usr.sbin/sysinstall/dispatch.c3
-rw-r--r--usr.sbin/sysinstall/install.c7
-rw-r--r--usr.sbin/sysinstall/menus.c5
-rw-r--r--usr.sbin/sysinstall/options.c5
-rw-r--r--usr.sbin/sysinstall/sysinstall.h7
11 files changed, 11 insertions, 42 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 0774972e9a95c..46c7fc374735c 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -6,7 +6,7 @@ CLEANFILES+= keymap.tmp keymap.h
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
-SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
+SRCS= anonFTP.c attr.c cdrom.c command.c config.c devices.c \
disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index bcc587fd3c4de..7e8c446dfadc6 100644
--- a/usr.sbin/sade/dispatch.c
+++ b/usr.sbin/sade/dispatch.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dispatch.c,v 1.11 1997/03/09 22:25:43 jkh Exp $
+ * $Id: dispatch.c,v 1.12 1997/03/10 21:11:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -44,7 +44,6 @@ static struct _word {
int (*handler)(dialogMenuItem *self);
} resWords[] = {
{ "configAnonFTP", configAnonFTP },
- { "configApache", configApache },
{ "configRouter", configRouter },
{ "configNFSServer", configNFSServer },
{ "configSamba", configSamba },
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 52eaf2889de1c..184d2924b2c89 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.183 1997/05/05 05:16:02 pst Exp $
+ * $Id: install.c,v 1.184 1997/05/05 06:32:43 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -536,10 +536,6 @@ installNovice(dialogMenuItem *self)
variable_set2("nfs_client", "YES");
dialog_clear_norefresh();
- if (!msgYesNo("Do you want to configure this machine as a WEB server?"))
- configApache(self);
-
- dialog_clear_norefresh();
if (!msgYesNo("Would you like to customize your system console settings?")) {
WINDOW *w = savescr();
@@ -980,7 +976,6 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_FTP_STATE, "passive");
variable_set2(VAR_NFS_SECURE, "YES");
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
- variable_set2(VAR_APACHE_PKG, PACKAGE_APACHE);
variable_set2(VAR_SAMBA_PKG, PACKAGE_SAMBA);
variable_set2(VAR_GATED_PKG, PACKAGE_GATED);
variable_set2(VAR_PCNFSD_PKG, PACKAGE_PCNFSD);
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 53fd591b2c1b8..4bca2e12a5ea5 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.131 1997/04/20 16:46:32 jkh Exp $
+ * $Id: menus.c,v 1.132 1997/05/14 07:12:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -285,7 +285,6 @@ DMenu MenuIndex = {
{ "Upgrade", "Upgrade an existing system.", NULL, installUpgrade },
{ "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" },
{ "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
- { "WEB Server", "Configure host as a WWW server.", dmenuVarCheck, configApache, NULL, "apache_httpd" },
#ifndef USE_XIG_ENVIRONMENT
{ "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
{ "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
@@ -1150,8 +1149,6 @@ DMenu MenuNetworking = {
dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod=YES" },
{ "Anon FTP", "This machine wishes to allow anonymous FTP.",
dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
- { "WEB Server", "This machine wishes to be a WWW server.",
- dmenuVarCheck, configApache, NULL, "apache_httpd" },
{ "Samba", "Install Samba for LanManager (NETBUI) access.",
dmenuVarCheck, configSamba, NULL, "samba" },
{ "PCNFSD", "Run authentication server for clients with PC-NFS.",
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 76836f9a57935..6c4acad8a1f08 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: sysinstall.h,v 1.127 1997/05/05 06:32:44 jkh Exp $
+ * $Id: sysinstall.h,v 1.128 1997/05/22 00:13:58 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -56,7 +56,6 @@
/* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5b3"
-#define PACKAGE_APACHE "apache-1.2b10"
#define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_SAMBA "samba-1.9.16p11"
@@ -90,7 +89,6 @@
#define TCP_CONFIGURED "_tcpConfigured"
/* Ones that can be tweaked from config files */
-#define VAR_APACHE_PKG "apache_pkg"
#define VAR_BLANKTIME "blanktime"
#define VAR_BOOTMGR "bootManager"
#define VAR_BROWSER_BINARY "browserBinary"
@@ -389,9 +387,6 @@ extern void display_helpline(WINDOW *w, int y, int width);
/*** Prototypes ***/
-/* apache.c */
-extern int configApache(dialogMenuItem *self);
-
/* anonFTP.c */
extern int configAnonFTP(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 0774972e9a95c..46c7fc374735c 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -6,7 +6,7 @@ CLEANFILES+= keymap.tmp keymap.h
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
-SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
+SRCS= anonFTP.c attr.c cdrom.c command.c config.c devices.c \
disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index bcc587fd3c4de..7e8c446dfadc6 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dispatch.c,v 1.11 1997/03/09 22:25:43 jkh Exp $
+ * $Id: dispatch.c,v 1.12 1997/03/10 21:11:52 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -44,7 +44,6 @@ static struct _word {
int (*handler)(dialogMenuItem *self);
} resWords[] = {
{ "configAnonFTP", configAnonFTP },
- { "configApache", configApache },
{ "configRouter", configRouter },
{ "configNFSServer", configNFSServer },
{ "configSamba", configSamba },
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 52eaf2889de1c..184d2924b2c89 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.183 1997/05/05 05:16:02 pst Exp $
+ * $Id: install.c,v 1.184 1997/05/05 06:32:43 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -536,10 +536,6 @@ installNovice(dialogMenuItem *self)
variable_set2("nfs_client", "YES");
dialog_clear_norefresh();
- if (!msgYesNo("Do you want to configure this machine as a WEB server?"))
- configApache(self);
-
- dialog_clear_norefresh();
if (!msgYesNo("Would you like to customize your system console settings?")) {
WINDOW *w = savescr();
@@ -980,7 +976,6 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_FTP_STATE, "passive");
variable_set2(VAR_NFS_SECURE, "YES");
variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
- variable_set2(VAR_APACHE_PKG, PACKAGE_APACHE);
variable_set2(VAR_SAMBA_PKG, PACKAGE_SAMBA);
variable_set2(VAR_GATED_PKG, PACKAGE_GATED);
variable_set2(VAR_PCNFSD_PKG, PACKAGE_PCNFSD);
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 53fd591b2c1b8..4bca2e12a5ea5 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.131 1997/04/20 16:46:32 jkh Exp $
+ * $Id: menus.c,v 1.132 1997/05/14 07:12:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -285,7 +285,6 @@ DMenu MenuIndex = {
{ "Upgrade", "Upgrade an existing system.", NULL, installUpgrade },
{ "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" },
{ "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
- { "WEB Server", "Configure host as a WWW server.", dmenuVarCheck, configApache, NULL, "apache_httpd" },
#ifndef USE_XIG_ENVIRONMENT
{ "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
{ "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
@@ -1150,8 +1149,6 @@ DMenu MenuNetworking = {
dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod=YES" },
{ "Anon FTP", "This machine wishes to allow anonymous FTP.",
dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
- { "WEB Server", "This machine wishes to be a WWW server.",
- dmenuVarCheck, configApache, NULL, "apache_httpd" },
{ "Samba", "Install Samba for LanManager (NETBUI) access.",
dmenuVarCheck, configSamba, NULL, "samba" },
{ "PCNFSD", "Run authentication server for clients with PC-NFS.",
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index d418110b966ff..1b4997882b38c 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
- * $Id$
+ * $Id: options.c,v 1.53 1997/02/07 04:26:46 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -101,7 +101,6 @@ mediaCheck(Option opt)
#define PKG_PROMPT "Please specify a temporary directory with lots of free space:"
#define INSTROOT_PROMPT "Please specify a root directory if installing somewhere other than /"
#define TIMEOUT_PROMPT "Please specify the number of seconds to wait for slow media:"
-#define APACHE_PKG_PROMPT "Please specify the package name for the Apache WEB server:"
#define SAMBA_PKG_PROMPT "Please specify the package name for the Samba server:"
#define GATED_PKG_PROMPT "Please specify the package name for the gated software:"
#define PCNFSD_PKG_PROMPT "Please specify the package name for the PCNFSD server:"
@@ -137,8 +136,6 @@ static Option Options[] = {
OPT_IS_VAR, TIMEOUT_PROMPT, VAR_MEDIA_TIMEOUT, varCheck },
{ "Package Temp", "The directory where package temporary files should go",
OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck },
-{ "Apache package", "The name of the Apache package to install if requested",
- OPT_IS_VAR, APACHE_PKG_PROMPT, VAR_APACHE_PKG, varCheck },
{ "Samba package", "The name of the Samba package to install if requested",
OPT_IS_VAR, SAMBA_PKG_PROMPT, VAR_SAMBA_PKG, varCheck },
{ "Gated package", "The name of the gated package to install if requested",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 76836f9a57935..6c4acad8a1f08 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: sysinstall.h,v 1.127 1997/05/05 06:32:44 jkh Exp $
+ * $Id: sysinstall.h,v 1.128 1997/05/22 00:13:58 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -56,7 +56,6 @@
/* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5b3"
-#define PACKAGE_APACHE "apache-1.2b10"
#define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_SAMBA "samba-1.9.16p11"
@@ -90,7 +89,6 @@
#define TCP_CONFIGURED "_tcpConfigured"
/* Ones that can be tweaked from config files */
-#define VAR_APACHE_PKG "apache_pkg"
#define VAR_BLANKTIME "blanktime"
#define VAR_BOOTMGR "bootManager"
#define VAR_BROWSER_BINARY "browserBinary"
@@ -389,9 +387,6 @@ extern void display_helpline(WINDOW *w, int y, int width);
/*** Prototypes ***/
-/* apache.c */
-extern int configApache(dialogMenuItem *self);
-
/* anonFTP.c */
extern int configAnonFTP(dialogMenuItem *self);
generated by cgit v1.3 (git 2.53.0) at 2026-08-05 06:05:54 +0000