X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=doc%2Fmyplc.xml;h=07e96a88727a40144b04bab70315a2b82a79375f;hb=99190e7caab7c2ed4daa3c30df8726a0f7f3c6f4;hp=5abeb58b975bf350ef61a42f1a2b0cef30714604;hpb=717cfbe7cb8ceb3a6175223e140137a77ee96ffe;p=myplc.git
diff --git a/doc/myplc.xml b/doc/myplc.xml
index 5abeb58..07e96a8 100644
--- a/doc/myplc.xml
+++ b/doc/myplc.xml
@@ -38,6 +38,15 @@
MLH
Add development environment.
+
+ 1.2
+ August 18, 2006
+ TPT
+
+ Review section on configuration and introduce plc-config-tty.
+ Present implementation details last.
+
+
@@ -227,7 +236,7 @@ Want to create /etc/planetlab/configs [y]/n ? y
Created directory /etc/planetlab/configs
Enter command (u for usual changes, w to save, ? for help) u
== PLC_NAME : [PlanetLab Test] OneLab
-== PLC_ROOT_USER : [root@localhost.localdomain] odie.inria.fr
+== PLC_ROOT_USER : [root@localhost.localdomain] root@odie.inria.fr
== PLC_ROOT_PASSWORD : [root] plain-passwd
== PLC_MAIL_SUPPORT_ADDRESS : [root+support@localhost.localdomain] support@one-lab.org
== PLC_DB_HOST : [localhost.localdomain] odie.inria.fr
@@ -255,7 +264,7 @@ Enter command (u for usual changes, w to save, ? for help) q
If you used this method for configuring, you can skip to
- the next section. As an alternative to using
+ the . As an alternative to using
plc-config-tty, you may also use a text
editor, but this requires some understanding on how the
configuration files are used within myplc. The
@@ -327,7 +336,7 @@ Enter command (u for usual changes, w to save, ? for help) q
PLC_NAME
- Login as a real user
+ Login as a real user
Now that myplc is up and running, you can connect to the
web site that by default runs on port 80. You can either
@@ -509,7 +518,8 @@ PLC: Signing node packages: [ OK ]
all services, including the API server, are enabled and run on
the same host, so check that PLC_API_HOST is
either localhost or resolves to a local IP
- address.
+ address. Also check that PLC_ROOT_USER looks like
+ an e-mail address.
Starting crond: If this step
fails, it is likely that the previous steps (Starting
@@ -610,6 +620,15 @@ PLC: Signing node packages: [ OK ]
Service uses to determine the state of slices. These XML
files are refreshed periodically by cron
jobs running in the MyPLC root.
+
+ /root: this is the
+ location of the root-user's homedir, and for your
+ convenience is stored under /data so
+ that your local customizations survive across
+ updates - this feature is inherited from the
+ myplc-devel package, where it is probably
+ more useful.
+
@@ -747,8 +766,12 @@ PLC: Signing node packages: [ OK ]
directory are themselves source controlled; see for more information about executing
builds.
-
-
+
+ /root: this is the
+ location of the root-user's homedir, and for your
+ convenience is stored under /data so
+ that your local customizations survive across
+ updates.
/etc/init.d/plc-devel: This file is
@@ -891,12 +914,14 @@ make -C $DATE]]>
Because the CVS repository is not automatically upgraded,
if you wish to keep your local repository synchronized with the
public PlanetLab repository, it is highly recommended that you
- use CVS's support for vendor
- branches to track changes. Vendor branches ease the task
- of merging upstream changes with your local modifications. To
- import a new snapshot into your local repository (for example,
- if you have just upgraded from
+ use CVS's support for vendor branches to track changes, as
+ described here
+ and here.
+ Vendor branches ease the task of merging upstream changes with
+ your local modifications. To import a new snapshot into your
+ local repository (for example, if you have just upgraded from
myplc-devel-0.4-2 to
myplc-devel-0.4-3 and you notice the new
repository in /plc/devel/data/cvs-0.4-3),
@@ -924,17 +949,16 @@ cvs -d /cvs rtag before-myplc-0_4-3-merge
TMP=$(mktemp -d /data/export.XXXXXX)
pushd $TMP
cvs -d /data/cvs-0.4-3 export -r HEAD .
-cvs -d /cvs import -m "PlanetLab sources from myplc-0.4-3" -ko -I ! . planetlab myplc-0_4-3
+cvs -d /cvs import -m "Merging myplc-0.4-3" -ko -I ! . planetlab myplc-0_4-3
popd
rm -rf $TMP]]>
- If there any merge conflicts, use the command suggested by
- CVS to help the merge. Explaining how to fix merge conflicts is
- beyond the scope of this document; consult the CVS documentation
- for more information on how to use CVS.
-
-
+ If there are any merge conflicts, use the command
+ suggested by CVS to help the merge. Explaining how to fix merge
+ conflicts is beyond the scope of this document; consult the CVS
+ documentation for more information on how to use CVS.
+
Configuration variables (for myplc)