Attachment #209887 for bug #193012

Lines 17-23 Link Here

(-)coda-6.9.4.orig/coda-src/scripts/venus.init.in (-1 / +1 lines)
17	export PATH	17	export PATH
18		18
19	# defaults	19	# defaults
20	pid_file=/usr/coda/venus.cache/pid	20	pid_file=/var/cache/venus/pid
21	mountpoint=/coda	21	mountpoint=/coda
22		22
23	# overridden from the venus.conf	23	# overridden from the venus.conf




#fi

# default paths
errorlog=/var/log/coda/console
cachedir=/var/cache/venus
checkpointdir=/var/spool/coda
logfile=/var/log/coda/venus.log
marinersocket=/var/spool/coda/mariner
pid_file=/var/cache/venus/pid
run_control_file=/var/cache/venus/VENUS_CTRL
rvm_log=/var/lib/coda/LOG
rvm_data=/var/lib/coda/DATA
mountpoint=/media/coda

# override with user defined paths
if [ x${conf} != x/dev/null ] ; then




    fi
fi

echon "What is the root directory for your coda server(s)? [/var/lib/coda/vice] "
vicedir=""
read vicedir

if [ "x$vicedir" = x ] ; then
    vicedir=/var/lib/coda/vice
fi

if [ $mkconf = 1 ] ; then

Lines 42-48 Link Here

(-)coda-6.9.4.orig/coda-src/scripts/vice-setup-rvm.in (-1 / +1 lines)
42	#	42	#
43		43
44	# defaults, will be overridden by settings in the server.conf file	44	# defaults, will be overridden by settings in the server.conf file
45	vicedir=/vice	45	vicedir=/var/lib/coda/vice
46		46
47	prefix=@prefix@	47	prefix=@prefix@
48	exec_prefix=@exec_prefix@	48	exec_prefix=@exec_prefix@




    echo
    
    if [ $numservers -gt 1 ]; then
	echon "Where shall we store your file data for server $n ($hn) [/var/lib/coda/vicepa]? "
    else
	echon 'Where shall we store your file data [/var/lib/coda/vicepa]? '
    fi
    srvdir=
    read srvdir

    if [ "x$srvdir" = x ]; then
	srvdir=/var/lib/coda/vicepa
    fi

    # Create the directory if needed.  (Symlink is OK.)

Lines 81-87 Link Here

(-)coda-6.9.4.orig/coda-src/vcodacon/monitor.cc (-1 / +1 lines)
81	TheMon = this;	81	TheMon = this;
82	}	82	}
83		83
84	CODACONF_STR(marinerport, "marinersocket", "/usr/coda/spool/mariner");	84	CODACONF_STR(marinerport, "marinersocket", "/var/spool/coda/mariner");
85		85
86	if (!conn.isOpen()) {	86	if (!conn.isOpen()) {
87	#if defined(HAVE_SYS_UN_H) && !defined(WIN32)	87	#if defined(HAVE_SYS_UN_H) && !defined(WIN32)




\fBrwx------\fR to protect the cache from
malicious local users.

Default: \fB/var/cache/venus\fR
.TP
\fB-m\fR
Controls what Coda Optimistic Protocol (COP) options

\fB-vld\fR
Location of the venus log file or partition.

Default: \fB/var/lib/coda/LOG\fR
.TP
\fB-vlds\fR
Size of the log file or partition.

\fB-vdd\fR
Location of the venus data file or partition.

Default: \fB/var/lib/coda/DATA\fR
.TP
\fB-vdds\fR
Size of the data file or partition.




	    else if (STREQ(argv[i], "-rvmt"))
		i++, RvmType = (rvm_type_t)(atoi(argv[i]));
	    else if (STREQ(argv[i], "-vld"))          /* location of log device */
		i++, VenusLogDevice = argv[i];        /* normally /var/lib/coda/LOG */
	    else if (STREQ(argv[i], "-vlds"))         /* log device size */
		i++, VenusLogDeviceSize = atoi(argv[i]);  
	    else if (STREQ(argv[i], "-vdd"))          /* location of data device */
                i++, VenusDataDevice = argv[i];       /* normally /var/lib/coda/DATA */
	    else if (STREQ(argv[i], "-vdds"))         /* meta-data device size */
		i++, VenusDataDeviceSize = atoi(argv[i]);
	    else if (STREQ(argv[i], "-rdscs"))        


    CODACONF_INT(CacheBlocks,	    "cacheblocks",   40000);
    CODACONF_STR(CacheDir,	    "cachedir",      DFLT_CD);
    CODACONF_STR(SpoolDir,	    "checkpointdir", "/var/spool/coda");
    CODACONF_STR(VenusLogFile,	    "logfile",	     DFLT_LOGFILE);
    CODACONF_STR(consoleFile,	    "errorlog",      DFLT_ERRLOG);
    CODACONF_STR(kernDevice,	    "kerneldevice",  "/dev/cfs0,/dev/coda/0");
    CODACONF_INT(MapPrivate,	    "mapprivate",     0);
    CODACONF_STR(MarinerSocketPath, "marinersocket", "/var/spool/coda/mariner");
    CODACONF_INT(masquerade_port,   "masquerade_port", 0);
    CODACONF_INT(allow_backfetch,   "allow_backfetch", 0);
    CODACONF_STR(venusRoot,	    "mountpoint",     DFLT_VR);
    CODACONF_INT(PrimaryUser,	    "primaryuser",    UNSET_PRIMARYUSER);
    CODACONF_STR(realmtab,	    "realmtab",	      "/etc/coda/realms");
    CODACONF_STR(VenusLogDevice,    "rvm_log",        "/var/lib/coda/LOG");
    CODACONF_STR(VenusDataDevice,   "rvm_data",       "/var/lib/coda/DATA");

    CODACONF_INT(rpc2_timeout,	    "RPC2_timeout",   DFLT_TO);
    CODACONF_INT(rpc2_retries,	    "RPC2_retries",   DFLT_RT);




# Which file is used for realm lookups, before we look at dns SRV and A
# records.
#
realmtab=/etc/coda/realms

#
# What should the size of the local cache be in 1k blocks. If this is


#
# Which file should receive venus's stderr output.
# (default is /var/log/coda/etc/console).
#
errorlog=/var/log/coda/console

#
# What is the uid of the primary user of this system. The primary user


#
# What are the locations of the rvm log and data files or partitions.
# (default /var/lib/coda/{LOG,DATA}
#
# CAUTION: these are _unrelated_ to the server's rvm log and data. Also
# when specifying partitions, do NOT specify any partions which might
# have an existing filesystem, as you WILL lose all data during
# initialization.
#
rvm_log=/var/lib/coda/LOG
rvm_data=/var/lib/coda/DATA

#
# Where should venus keep it's pool of cached files.
# (default is /var/cache/venus)
#
cachedir=/var/cache/venus

#
# Where should venus store snapshots of the modification logs. This is
# primarily to provide some safe fallback when venus dies or messes up
# the CML during reintegration. (default is /var/spool/coda)
#
checkpointdir=/var/spool/coda

#
# Checkpoint archive format

#
# Where does venus store it's pidfile
#
pid_file=/var/cache/venus/pid

#
# What file does vutil use to control venus
#
run_control_file=/var/cache/venus/VENUS_CTRL

#
# Venus log file
#
logfile=/var/log/coda/venus.log

#
# Mariner socket,

# codacon and spy use to talk to venus. On other platforms they will
# connect to venus through tcp port 2430.
#
marinersocket=/var/spool/coda/mariner

#
# Dont use RVM,

#
#isr=0

# Mountpoint,
# Where the coda filesystem is mounted, many application still depend on
# this being /coda. I am unsure whether it matters much on Windows95/98,
# but we normally use N: for those.
#
#mountpoint=N:
#mountpoint=/media/coda
mountpoint=/media/coda






/*  *****  parameter defaults.  ***** */
#define DFLT_VR "/coda"				/* venus root */
#define DFLT_CD "/var/cache/venus"		/* cache directory */
/* the next two are relative to cachedir if they do not start with '/' */
#define DFLT_PIDFILE "pid"			/* default pid file */
#define DFLT_CTRLFILE "VENUS_CTRL"		/* default control file */

#define DFLT_LOGFILE "/var/log/coda/venus.log"	/* venus log file */
#define DFLT_ERRLOG  "/var/log/coda/console"	/* venus error log */

/* rule of thumb */
const int BLOCKS_PER_FILE = 24;

Lines 11-17 Link Here

(-)coda-6.9.4.orig/coda-src/vice/server.conf.ex (-1 / +1 lines)
11	#	11	#
12	# Prefix of server tree	12	# Prefix of server tree
13	#	13	#
14	#vicedir=/vice	14	#vicedir=/var/lib/coda/vice
15		15
16	#	16	#
17	# Should the server use private mmaps for RVM	17	# Should the server use private mmaps for RVM

Lines 114-120 Link Here

(-)coda-6.9.4.orig/coda-src/vtools/cfs.1 (-1 / +1 lines)
114	.TP	114	.TP
115	\fBcheckpointml\fR	115	\fBcheckpointml\fR
116	Checkpoint volume modify log. This command will create a	116	Checkpoint volume modify log. This command will create a
117	checkpoint file /usr/coda/spool/uid/vol@mountpt\&. Where uid is your local user id,	117	checkpoint file /var/spool/coda/uid/vol@mountpt\&. Where uid is your local user id,
118	vol is the volume being checkpointed,	118	vol is the volume being checkpointed,
119	and mountpt is the volume's mount point.	119	and mountpt is the volume's mount point.
120		120




	filenames = argv;
    }
    else
    {/* No filenames specified on cmd line: look in pid file */
	first = 0;
	last = findclosures(&filenames) - 1;
	if (last < 0) {printf("No closures found\n"); exit(-1);}



static int findclosures(char ***clist)
{/* Constructs an argv[]-like structure of closures in /var/spool/coda/<uid>.
    Return the # of closures found.
  */
    int n = 0;

    DIR *dirp;
    struct dirent *td;

    CODACONF_STR(checkpointdir, "checkpointdir", "/var/spool/coda");
    sprintf(spooldir, "%s/%d", checkpointdir, getuid());

    dirp = opendir(spooldir);

	filenames = argv;
    }
    else
    {/* No filenames specified on cmd line: look in pid file */
	first = 0;
	last = findclosures(&filenames) - 1;
	if (last < 0) {printf("No closures found\n"); exit(-1);}

Lines 107-113 Link Here

(-)coda-6.9.4.orig/coda-src/vtools/codacon.cc (-1 / +1 lines)
107		107
108	codaconf_init("venus.conf");	108	codaconf_init("venus.conf");
109	MarinerSocketPath = codaconf_lookup("marinersocket",	109	MarinerSocketPath = codaconf_lookup("marinersocket",
110	"/usr/coda/spool/mariner");	110	"/var/spool/coda/mariner");
111	memset(&s_un, 0, sizeof(s_un));	111	memset(&s_un, 0, sizeof(s_un));
112	s_un.sun_family = AF_UNIX;	112	s_un.sun_family = AF_UNIX;
113	strcpy(s_un.sun_path, MarinerSocketPath);	113	strcpy(s_un.sun_path, MarinerSocketPath);

Lines 253-259 Link Here

(-)coda-6.9.4.orig/coda-src/vtools/gcodacon.in (-1 / +1 lines)
253		253
254	if not self.use_tcp:	254	if not self.use_tcp:
255	venusconf = parse_codaconf(venus_conf)	255	venusconf = parse_codaconf(venus_conf)
256	mariner = venusconf.get("marinersocket", "/usr/coda/spool/mariner")	256	mariner = venusconf.get("marinersocket", "/var/spool/coda/mariner")
257	self.addrs = [(socket.AF_UNIX, socket.SOCK_STREAM, 0, 0, mariner)]	257	self.addrs = [(socket.AF_UNIX, socket.SOCK_STREAM, 0, 0, mariner)]
258	else:	258	else:
259	self.addrs = socket.getaddrinfo(None, 'venus', socket.AF_INET,	259	self.addrs = socket.getaddrinfo(None, 'venus', socket.AF_INET,

Lines 116-122 Link Here

(-)coda-6.9.4.orig/coda-src/vtools/spy.cc (-1 / +1 lines)
116		116
117	codaconf_init("venus.conf");	117	codaconf_init("venus.conf");
118	MarinerSocketPath = codaconf_lookup("marinersocket",	118	MarinerSocketPath = codaconf_lookup("marinersocket",
119	"/usr/coda/spool/mariner");	119	"/var/spool/coda/mariner");
120	memset(&s_un, 0, sizeof(s_un));	120	memset(&s_un, 0, sizeof(s_un));
121	s_un.sun_family = AF_UNIX;	121	s_un.sun_family = AF_UNIX;
122	strcpy(s_un.sun_path, MarinerSocketPath);	122	strcpy(s_un.sun_path, MarinerSocketPath);




make prefix=$RPM_BUILD_ROOT/usr install

mkdir -p $RPM_BUILD_ROOT/coda
mkdir -p $RPM_BUILD_ROOT/var/log/coda
mkdir -p $RPM_BUILD_ROOT/var/cache/coda
touch $RPM_BUILD_ROOT/coda/NOT_REALLY_CODA

%clean

fi

%post client
if [ -e /var/cache/venus/pid ]; then
    rm -f /var/cache/venus/pid
fi
if [ ! -e /etc/coda/venus.conf ]; then
	/usr/sbin/venus-setup "" 100000


%files client
%defattr(-,root,root)
#%dir /usr/coda
%dir /var/log/coda
%dir /var/cache/venus
%dir /coda
%verify() /coda/NOT_REALLY_CODA
/etc/coda/realms

Return to bug 193012

Lines 65-80 Link Here

(-)coda-6.9.4.orig/coda-src/scripts/venus-setup.in (-10 / +10 lines)
65	#fi	65	#fi
66		66
67	# default paths	67	# default paths
68	errorlog=/usr/coda/etc/console	68	errorlog=/var/log/coda/console
69	cachedir=/usr/coda/venus.cache	69	cachedir=/var/cache/venus
70	checkpointdir=/usr/coda/spool	70	checkpointdir=/var/spool/coda
71	logfile=/usr/coda/etc/venus.log	71	logfile=/var/log/coda/venus.log
72	marinersocket=/usr/coda/spool/mariner	72	marinersocket=/var/spool/coda/mariner
73	pid_file=/usr/coda/venus.cache/pid	73	pid_file=/var/cache/venus/pid
74	run_control_file=/usr/coda/venus.cache/VENUS_CTRL	74	run_control_file=/var/cache/venus/VENUS_CTRL
75	rvm_log=/usr/coda/LOG	75	rvm_log=/var/lib/coda/LOG
76	rvm_data=/usr/coda/DATA	76	rvm_data=/var/lib/coda/DATA
77	mountpoint=/coda	77	mountpoint=/media/coda
78		78
79	# override with user defined paths	79	# override with user defined paths
80	if [ x${conf} != x/dev/null ] ; then	80	if [ x${conf} != x/dev/null ] ; then

Lines 61-67 Link Here

(-)coda-6.9.4.orig/coda-src/venus/venus.8 (-3 / +3 lines)
61	\fBrwx------\fR to protect the cache from	61	\fBrwx------\fR to protect the cache from
62	malicious local users.	62	malicious local users.
63		63
64	Default: \fB/usr/coda/venus.cache\fR	64	Default: \fB/var/cache/venus\fR
65	.TP	65	.TP
66	\fB-m\fR	66	\fB-m\fR
67	Controls what Coda Optimistic Protocol (COP) options	67	Controls what Coda Optimistic Protocol (COP) options
Lines 131-137 Link Here
131	\fB-vld\fR	131	\fB-vld\fR
132	Location of the venus log file or partition.	132	Location of the venus log file or partition.
133		133
134	Default: \fB/usr/coda/LOG\fR	134	Default: \fB/var/lib/coda/LOG\fR
135	.TP	135	.TP
136	\fB-vlds\fR	136	\fB-vlds\fR
137	Size of the log file or partition.	137	Size of the log file or partition.
Lines 139-145 Link Here
139	\fB-vdd\fR	139	\fB-vdd\fR
140	Location of the venus data file or partition.	140	Location of the venus data file or partition.
141		141
142	Default: \fB/usr/coda/DATA\fR	142	Default: \fB/var/lib/coda/DATA\fR
143	.TP	143	.TP
144	\fB-vdds\fR	144	\fB-vdds\fR
145	Size of the data file or partition.	145	Size of the data file or partition.

Lines 806-812 Link Here

(-)coda-6.9.4.orig/coda-src/vtools/cfs.cc (-4 / +4 lines)
806	filenames = argv;	806	filenames = argv;
807	}	807	}
808	else	808	else
809	{/* No filenames specified on cmd line: look in /usr/coda/spool/<uid> */	809	{/* No filenames specified on cmd line: look in pid file */
810	first = 0;	810	first = 0;
811	last = findclosures(&filenames) - 1;	811	last = findclosures(&filenames) - 1;
812	if (last < 0) {printf("No closures found\n"); exit(-1);}	812	if (last < 0) {printf("No closures found\n"); exit(-1);}
Lines 896-902 Link Here
896		896
897		897
898	static int findclosures(char ***clist)	898	static int findclosures(char ***clist)
899	{/* Constructs an argv[]-like structure of closures in /usr/coda/spool/<uid>.	899	{/* Constructs an argv[]-like structure of closures in /var/spool/coda/<uid>.
900	Return the # of closures found.	900	Return the # of closures found.
901	*/	901	*/
902	int n = 0;	902	int n = 0;
Lines 906-912 Link Here
906	DIR *dirp;	906	DIR *dirp;
907	struct dirent *td;	907	struct dirent *td;
908		908
909	CODACONF_STR(checkpointdir, "checkpointdir", "/usr/coda/spool");	909	CODACONF_STR(checkpointdir, "checkpointdir", "/var/spool/coda");
910	sprintf(spooldir, "%s/%d", checkpointdir, getuid());	910	sprintf(spooldir, "%s/%d", checkpointdir, getuid());
911		911
912	dirp = opendir(spooldir);	912	dirp = opendir(spooldir);
Lines 2151-2157 Link Here
2151	filenames = argv;	2151	filenames = argv;
2152	}	2152	}
2153	else	2153	else
2154	{/* No filenames specified on cmd line: look in /usr/coda/spool/<uid> */	2154	{/* No filenames specified on cmd line: look in pid file */
2155	first = 0;	2155	first = 0;
2156	last = findclosures(&filenames) - 1;	2156	last = findclosures(&filenames) - 1;
2157	if (last < 0) {printf("No closures found\n"); exit(-1);}	2157	if (last < 0) {printf("No closures found\n"); exit(-1);}

Lines 120-131 Link Here

(-)coda-6.9.4.orig/coda-src/scripts/vice-setup.in (-2 / +2 lines)
120	fi	120	fi
121	fi	121	fi
122		122
123	echon "What is the root directory for your coda server(s)? [/vice] "	123	echon "What is the root directory for your coda server(s)? [/var/lib/coda/vice] "
124	vicedir=""	124	vicedir=""
125	read vicedir	125	read vicedir
126		126
127	if [ "x$vicedir" = x ] ; then	127	if [ "x$vicedir" = x ] ; then
128	vicedir=/vice	128	vicedir=/var/lib/coda/vice
129	fi	129	fi
130		130
131	if [ $mkconf = 1 ] ; then	131	if [ $mkconf = 1 ] ; then

Lines 76-90 Link Here

(-)coda-6.9.4.orig/coda-src/scripts/vice-setup-srvdir (-3 / +3 lines)
76	echo	76	echo
77		77
78	if [ $numservers -gt 1 ]; then	78	if [ $numservers -gt 1 ]; then
79	echon "Where shall we store your file data for server $n ($hn) [/vicepa]? "	79	echon "Where shall we store your file data for server $n ($hn) [/var/lib/coda/vicepa]? "
80	else	80	else
81	echon 'Where shall we store your file data [/vicepa]? '	81	echon 'Where shall we store your file data [/var/lib/coda/vicepa]? '
82	fi	82	fi
83	srvdir=	83	srvdir=
84	read srvdir	84	read srvdir
85		85
86	if [ "x$srvdir" = x ]; then	86	if [ "x$srvdir" = x ]; then
87	srvdir=/vicepa	87	srvdir=/var/lib/coda/vicepa
88	fi	88	fi
89		89
90	# Create the directory if needed. (Symlink is OK.)	90	# Create the directory if needed. (Symlink is OK.)

Lines 398-408 Link Here

(-)coda-6.9.4.orig/coda-src/venus/venus.cc (-6 / +6 lines)
398	else if (STREQ(argv[i], "-rvmt"))	398	else if (STREQ(argv[i], "-rvmt"))
399	i++, RvmType = (rvm_type_t)(atoi(argv[i]));	399	i++, RvmType = (rvm_type_t)(atoi(argv[i]));
400	else if (STREQ(argv[i], "-vld")) /* location of log device */	400	else if (STREQ(argv[i], "-vld")) /* location of log device */
401	i++, VenusLogDevice = argv[i]; /* normally /usr/coda/LOG */	401	i++, VenusLogDevice = argv[i]; /* normally /var/lib/coda/LOG */
402	else if (STREQ(argv[i], "-vlds")) /* log device size */	402	else if (STREQ(argv[i], "-vlds")) /* log device size */
403	i++, VenusLogDeviceSize = atoi(argv[i]);	403	i++, VenusLogDeviceSize = atoi(argv[i]);
404	else if (STREQ(argv[i], "-vdd")) /* location of data device */	404	else if (STREQ(argv[i], "-vdd")) /* location of data device */
405	i++, VenusDataDevice = argv[i]; /* normally /usr/coda/DATA */	405	i++, VenusDataDevice = argv[i]; /* normally /var/lib/coda/DATA */
406	else if (STREQ(argv[i], "-vdds")) /* meta-data device size */	406	else if (STREQ(argv[i], "-vdds")) /* meta-data device size */
407	i++, VenusDataDeviceSize = atoi(argv[i]);	407	i++, VenusDataDeviceSize = atoi(argv[i]);
408	else if (STREQ(argv[i], "-rdscs"))	408	else if (STREQ(argv[i], "-rdscs"))
Lines 476-494 Link Here
476		476
477	CODACONF_INT(CacheBlocks, "cacheblocks", 40000);	477	CODACONF_INT(CacheBlocks, "cacheblocks", 40000);
478	CODACONF_STR(CacheDir, "cachedir", DFLT_CD);	478	CODACONF_STR(CacheDir, "cachedir", DFLT_CD);
479	CODACONF_STR(SpoolDir, "checkpointdir", "/usr/coda/spool");	479	CODACONF_STR(SpoolDir, "checkpointdir", "/var/spool/coda");
480	CODACONF_STR(VenusLogFile, "logfile", DFLT_LOGFILE);	480	CODACONF_STR(VenusLogFile, "logfile", DFLT_LOGFILE);
481	CODACONF_STR(consoleFile, "errorlog", DFLT_ERRLOG);	481	CODACONF_STR(consoleFile, "errorlog", DFLT_ERRLOG);
482	CODACONF_STR(kernDevice, "kerneldevice", "/dev/cfs0,/dev/coda/0");	482	CODACONF_STR(kernDevice, "kerneldevice", "/dev/cfs0,/dev/coda/0");
483	CODACONF_INT(MapPrivate, "mapprivate", 0);	483	CODACONF_INT(MapPrivate, "mapprivate", 0);
484	CODACONF_STR(MarinerSocketPath, "marinersocket", "/usr/coda/spool/mariner");	484	CODACONF_STR(MarinerSocketPath, "marinersocket", "/var/spool/coda/mariner");
485	CODACONF_INT(masquerade_port, "masquerade_port", 0);	485	CODACONF_INT(masquerade_port, "masquerade_port", 0);
486	CODACONF_INT(allow_backfetch, "allow_backfetch", 0);	486	CODACONF_INT(allow_backfetch, "allow_backfetch", 0);
487	CODACONF_STR(venusRoot, "mountpoint", DFLT_VR);	487	CODACONF_STR(venusRoot, "mountpoint", DFLT_VR);
488	CODACONF_INT(PrimaryUser, "primaryuser", UNSET_PRIMARYUSER);	488	CODACONF_INT(PrimaryUser, "primaryuser", UNSET_PRIMARYUSER);
489	CODACONF_STR(realmtab, "realmtab", "/etc/coda/realms");	489	CODACONF_STR(realmtab, "realmtab", "/etc/coda/realms");
490	CODACONF_STR(VenusLogDevice, "rvm_log", "/usr/coda/LOG");	490	CODACONF_STR(VenusLogDevice, "rvm_log", "/var/lib/coda/LOG");
491	CODACONF_STR(VenusDataDevice, "rvm_data", "/usr/coda/DATA");	491	CODACONF_STR(VenusDataDevice, "rvm_data", "/var/lib/coda/DATA");
492		492
493	CODACONF_INT(rpc2_timeout, "RPC2_timeout", DFLT_TO);	493	CODACONF_INT(rpc2_timeout, "RPC2_timeout", DFLT_TO);
494	CODACONF_INT(rpc2_retries, "RPC2_retries", DFLT_RT);	494	CODACONF_INT(rpc2_retries, "RPC2_retries", DFLT_RT);

Lines 20-26 Link Here

(-)coda-6.9.4.orig/coda-src/venus/venus.conf.ex (-14 / +23 lines)
20	# Which file is used for realm lookups, before we look at dns SRV and A	20	# Which file is used for realm lookups, before we look at dns SRV and A
21	# records.	21	# records.
22	#	22	#
23	#realmtab=/etc/coda/realms	23	realmtab=/etc/coda/realms
24		24
25	#	25	#
26	# What should the size of the local cache be in 1k blocks. If this is	26	# What should the size of the local cache be in 1k blocks. If this is
Lines 55-63 Link Here
55		55
56	#	56	#
57	# Which file should receive venus's stderr output.	57	# Which file should receive venus's stderr output.
58	# (default is /usr/coda/etc/console).	58	# (default is /var/log/coda/etc/console).
59	#	59	#
60	#errorlog=/usr/coda/etc/console	60	errorlog=/var/log/coda/console
61		61
62	#	62	#
63	# What is the uid of the primary user of this system. The primary user	63	# What is the uid of the primary user of this system. The primary user
Lines 72-99 Link Here
72		72
73	#	73	#
74	# What are the locations of the rvm log and data files or partitions.	74	# What are the locations of the rvm log and data files or partitions.
75	# (default /usr/coda/{LOG,DATA}	75	# (default /var/lib/coda/{LOG,DATA}
76	#	76	#
77	# CAUTION: these are _unrelated_ to the server's rvm log and data. Also	77	# CAUTION: these are _unrelated_ to the server's rvm log and data. Also
78	# when specifying partitions, do NOT specify any partions which might	78	# when specifying partitions, do NOT specify any partions which might
79	# have an existing filesystem, as you WILL lose all data during	79	# have an existing filesystem, as you WILL lose all data during
80	# initialization.	80	# initialization.
81	#	81	#
82	#rvm_log=/usr/coda/LOG	82	rvm_log=/var/lib/coda/LOG
83	#rvm_data=/usr/coda/DATA	83	rvm_data=/var/lib/coda/DATA
84		84
85	#	85	#
86	# Where should venus keep it's pool of cached files.	86	# Where should venus keep it's pool of cached files.
87	# (default is /usr/coda/venus.cache)	87	# (default is /var/cache/venus)
88	#	88	#
89	#cachedir=/usr/coda/venus.cache	89	cachedir=/var/cache/venus
90		90
91	#	91	#
92	# Where should venus store snapshots of the modification logs. This is	92	# Where should venus store snapshots of the modification logs. This is
93	# primarily to provide some safe fallback when venus dies or messes up	93	# primarily to provide some safe fallback when venus dies or messes up
94	# the CML during reintegration. (default is /usr/coda/spool)	94	# the CML during reintegration. (default is /var/spool/coda)
95	#	95	#
96	#checkpointdir=/usr/coda/spool	96	checkpointdir=/var/spool/coda
97		97
98	#	98	#
99	# Checkpoint archive format	99	# Checkpoint archive format
Lines 113-129 Link Here
113	#	113	#
114	# Where does venus store it's pidfile	114	# Where does venus store it's pidfile
115	#	115	#
116	#pid_file=/usr/coda/venus.cache/pid	116	pid_file=/var/cache/venus/pid
117		117
118	#	118	#
119	# What file does vutil use to control venus	119	# What file does vutil use to control venus
120	#	120	#
121	#run_control_file=/usr/coda/venus.cache/VENUS_CTRL	121	run_control_file=/var/cache/venus/VENUS_CTRL
122		122
123	#	123	#
124	# Venus log file	124	# Venus log file
125	#	125	#
126	#logfile=/usr/coda/etc/venus.log	126	logfile=/var/log/coda/venus.log
127		127
128	#	128	#
129	# Mariner socket,	129	# Mariner socket,
Lines 131-137 Link Here
131	# codacon and spy use to talk to venus. On other platforms they will	131	# codacon and spy use to talk to venus. On other platforms they will
132	# connect to venus through tcp port 2430.	132	# connect to venus through tcp port 2430.
133	#	133	#
134	#marinersocket=/usr/coda/spool/mariner	134	marinersocket=/var/spool/coda/mariner
135		135
136	#	136	#
137	# Dont use RVM,	137	# Dont use RVM,
Lines 303-305 Link Here
303	#	303	#
304	#isr=0	304	#isr=0
305		305
		306	# Mountpoint,
		307	# Where the coda filesystem is mounted, many application still depend on
		308	# this being /coda. I am unsure whether it matters much on Windows95/98,
		309	# but we normally use N: for those.
		310	#
		311	#mountpoint=N:
		312	#mountpoint=/media/coda
		313	mountpoint=/media/coda
		314

Lines 89-101 Link Here

(-)coda-6.9.4.orig/coda-src/venus/venus.private.h (-3 / +3 lines)
89		89
90	/* *** parameter defaults. *** */	90	/* *** parameter defaults. *** */
91	#define DFLT_VR "/coda" /* venus root */	91	#define DFLT_VR "/coda" /* venus root */
92	#define DFLT_CD "/usr/coda/venus.cache" /* cache directory */	92	#define DFLT_CD "/var/cache/venus" /* cache directory */
93	/* the next two are relative to cachedir if they do not start with '/' */	93	/* the next two are relative to cachedir if they do not start with '/' */
94	#define DFLT_PIDFILE "pid" /* default pid file */	94	#define DFLT_PIDFILE "pid" /* default pid file */
95	#define DFLT_CTRLFILE "VENUS_CTRL" /* default control file */	95	#define DFLT_CTRLFILE "VENUS_CTRL" /* default control file */
96		96
97	#define DFLT_LOGFILE "/usr/coda/etc/venus.log" /* venus log file */	97	#define DFLT_LOGFILE "/var/log/coda/venus.log" /* venus log file */
98	#define DFLT_ERRLOG "/usr/coda/etc/console" /* venus error log */	98	#define DFLT_ERRLOG "/var/log/coda/console" /* venus error log */
99		99
100	/* rule of thumb */	100	/* rule of thumb */
101	const int BLOCKS_PER_FILE = 24;	101	const int BLOCKS_PER_FILE = 24;

Lines 101-108 Link Here

(-)coda-6.9.4.orig/tools/coda.spec.in (-7 / +7 lines)
101	make prefix=$RPM_BUILD_ROOT/usr install	101	make prefix=$RPM_BUILD_ROOT/usr install
102		102
103	mkdir -p $RPM_BUILD_ROOT/coda	103	mkdir -p $RPM_BUILD_ROOT/coda
104	mkdir -p $RPM_BUILD_ROOT/usr/coda/etc	104	mkdir -p $RPM_BUILD_ROOT/var/log/coda
105	mkdir -p $RPM_BUILD_ROOT/usr/coda/venus.cache	105	mkdir -p $RPM_BUILD_ROOT/var/cache/coda
106	touch $RPM_BUILD_ROOT/coda/NOT_REALLY_CODA	106	touch $RPM_BUILD_ROOT/coda/NOT_REALLY_CODA
107		107
108	%clean	108	%clean
Lines 118-125 Link Here
118	fi	118	fi
119		119
120	%post client	120	%post client
121	if [ -e /usr/coda/venus.cache/pid ]; then	121	if [ -e /var/cache/venus/pid ]; then
122	rm -f /usr/coda/venus.cache/pid	122	rm -f /var/cache/venus/pid
123	fi	123	fi
124	if [ ! -e /etc/coda/venus.conf ]; then	124	if [ ! -e /etc/coda/venus.conf ]; then
125	/usr/sbin/venus-setup "" 100000	125	/usr/sbin/venus-setup "" 100000
Lines 150-158 Link Here
150		150
151	%files client	151	%files client
152	%defattr(-,root,root)	152	%defattr(-,root,root)
153	%dir /usr/coda	153	#%dir /usr/coda
154	%dir /usr/coda/etc	154	%dir /var/log/coda
155	%dir /usr/coda/venus.cache	155	%dir /var/cache/venus
156	%dir /coda	156	%dir /coda
157	%verify() /coda/NOT_REALLY_CODA	157	%verify() /coda/NOT_REALLY_CODA
158	/etc/coda/realms	158	/etc/coda/realms