svn commit: samba r8598 - in branches/SAMBA_4_0/swat: . esptest
install
tridge at samba.org
tridge at samba.org
Tue Jul 19 11:06:12 GMT 2005
Author: tridge
Date: 2005-07-19 11:06:12 +0000 (Tue, 19 Jul 2005)
New Revision: 8598
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8598
Log:
move provisioning to /install/ directory from /esptest/
Added:
branches/SAMBA_4_0/swat/install/
branches/SAMBA_4_0/swat/install/index.esp
branches/SAMBA_4_0/swat/install/menu.js
branches/SAMBA_4_0/swat/install/newuser.esp
branches/SAMBA_4_0/swat/install/provision.esp
Removed:
branches/SAMBA_4_0/swat/esptest/newuser.esp
branches/SAMBA_4_0/swat/esptest/provision.esp
Modified:
branches/SAMBA_4_0/swat/menu.js
Changeset:
Deleted: branches/SAMBA_4_0/swat/esptest/newuser.esp
===================================================================
--- branches/SAMBA_4_0/swat/esptest/newuser.esp 2005-07-19 10:15:10 UTC (rev 8597)
+++ branches/SAMBA_4_0/swat/esptest/newuser.esp 2005-07-19 11:06:12 UTC (rev 8598)
@@ -1,41 +0,0 @@
-<% page_header("columns", "Add a user", "/esptest/menu.js");
-
- libinclude("base.js");
- libinclude("provision.js");
-%>
-
-<h1>Add a user</h1>
-
-<%
-var f = FormObj("newuser", 3, 2);
-var i;
-
-f.element[0].label = "User Name";
-f.element[0].name = "USERNAME";
-f.element[1].label = "Unix Name";
-f.element[1].name = "UNIXNAME";
-f.element[2].label = "Password";
-f.element[2].name = "PASSWORD";
-f.submit[0] = "Add";
-f.submit[1] = "Cancel";
-
-if (form['submit'] == "Cancel") {
- redirect("/");
-}
-
-if (form['submit'] == "Add" &&
- form.USERNAME != undefined) {
- if (form.UNIXNAME == undefined) {
- form.UNIXNAME = form.USERNAME;
- }
- if (form.PASSWORD == undefined) {
- form.PASSWORD = randpass();
- }
- newuser(form.USERNAME, form.UNIXNAME, form.PASSWORD, writefln);
-} else {
- display_form(f);
-}
-%>
-
-
-<% page_footer(); %>
Deleted: branches/SAMBA_4_0/swat/esptest/provision.esp
===================================================================
--- branches/SAMBA_4_0/swat/esptest/provision.esp 2005-07-19 10:15:10 UTC (rev 8597)
+++ branches/SAMBA_4_0/swat/esptest/provision.esp 2005-07-19 11:06:12 UTC (rev 8598)
@@ -1,55 +0,0 @@
-<% page_header("columns", "Server provisioning", "/esptest/menu.js");
-
- libinclude("base.js");
- libinclude("provision.js");
-%>
-
-<h1>Samba4 provisioning</h1>
-
-<%
-var f = FormObj("Provisioning", 9, 2);
-var i, subobj = provision_guess();
-
-f.element[0].label = "Realm";
-f.element[0].name = "REALM";
-f.element[1].label = "Domain Name";
-f.element[1].name = "DOMAIN";
-f.element[2].label = "Host Name";
-f.element[2].name = "HOSTNAME";
-f.element[3].label = "Administrator Password";
-f.element[3].name = "ADMINPASS";
-f.element[4].label = "Domain SID";
-f.element[4].name = "DOMAINSID";
-f.element[5].label = "Host GUID";
-f.element[5].name = "HOSTGUID";
-f.element[6].label = "Base DN";
-f.element[6].name = "BASEDN";
-f.element[7].label = "Host IP";
-f.element[7].name = "HOSTIP";
-f.element[8].label = "Default Site";
-f.element[8].name = "DEFAULTSITE";
-f.submit[0] = "Provision";
-f.submit[1] = "Cancel";
-
-if (form['submit'] == "Cancel") {
- redirect("/");
-}
-
-if (form['submit'] == "Provision") {
- for (r in form) {
- subobj[r] = form[r];
- }
-}
-
-for (i=0;i<f.element.length;i++) {
- f.element[i].value = subobj[f.element[i].name];
-}
-if (form['submit'] == "Provision") {
- provision(subobj, writefln);
-} else {
- display_form(f);
-}
-%>
-
-
-<% page_footer(); %>
Added: branches/SAMBA_4_0/swat/install/index.esp
===================================================================
--- branches/SAMBA_4_0/swat/install/index.esp 2005-07-19 10:15:10 UTC (rev 8597)
+++ branches/SAMBA_4_0/swat/install/index.esp 2005-07-19 11:06:12 UTC (rev 8598)
@@ -0,0 +1,6 @@
+<% page_header("columns", "Server Installation", "/install/menu.js");
+%>
+
+<h1>Installation</h1>
+
+<% page_footer(); %>
Added: branches/SAMBA_4_0/swat/install/menu.js
===================================================================
--- branches/SAMBA_4_0/swat/install/menu.js 2005-07-19 10:15:10 UTC (rev 8597)
+++ branches/SAMBA_4_0/swat/install/menu.js 2005-07-19 11:06:12 UTC (rev 8598)
@@ -0,0 +1,5 @@
+/* show a menu for the esp test pages */
+simple_menu(
+ "Installation",
+ "Provisioning", session_uri("/install/provision.esp"),
+ "New User", session_uri("/install/newuser.esp"));
Copied: branches/SAMBA_4_0/swat/install/newuser.esp (from rev 8591, branches/SAMBA_4_0/swat/esptest/newuser.esp)
===================================================================
--- branches/SAMBA_4_0/swat/esptest/newuser.esp 2005-07-19 09:34:11 UTC (rev 8591)
+++ branches/SAMBA_4_0/swat/install/newuser.esp 2005-07-19 11:06:12 UTC (rev 8598)
@@ -0,0 +1,41 @@
+<% page_header("columns", "Add a user", "/install/menu.js");
+
+ libinclude("base.js");
+ libinclude("provision.js");
+%>
+
+<h1>Add a user</h1>
+
+<%
+var f = FormObj("newuser", 3, 2);
+var i;
+
+f.element[0].label = "User Name";
+f.element[0].name = "USERNAME";
+f.element[1].label = "Unix Name";
+f.element[1].name = "UNIXNAME";
+f.element[2].label = "Password";
+f.element[2].name = "PASSWORD";
+f.submit[0] = "Add";
+f.submit[1] = "Cancel";
+
+if (form['submit'] == "Cancel") {
+ redirect("/");
+}
+
+if (form['submit'] == "Add" &&
+ form.USERNAME != undefined) {
+ if (form.UNIXNAME == undefined) {
+ form.UNIXNAME = form.USERNAME;
+ }
+ if (form.PASSWORD == undefined) {
+ form.PASSWORD = randpass();
+ }
+ newuser(form.USERNAME, form.UNIXNAME, form.PASSWORD, writefln);
+} else {
+ display_form(f);
+}
+%>
+
+
+<% page_footer(); %>
Copied: branches/SAMBA_4_0/swat/install/provision.esp (from rev 8591, branches/SAMBA_4_0/swat/esptest/provision.esp)
===================================================================
--- branches/SAMBA_4_0/swat/esptest/provision.esp 2005-07-19 09:34:11 UTC (rev 8591)
+++ branches/SAMBA_4_0/swat/install/provision.esp 2005-07-19 11:06:12 UTC (rev 8598)
@@ -0,0 +1,55 @@
+<% page_header("columns", "Provisioning", "/install/menu.js");
+
+ libinclude("base.js");
+ libinclude("provision.js");
+%>
+
+<h1>Samba4 provisioning</h1>
+
+<%
+var f = FormObj("Provisioning", 9, 2);
+var i, subobj = provision_guess();
+
+f.element[0].label = "Realm";
+f.element[0].name = "REALM";
+f.element[1].label = "Domain Name";
+f.element[1].name = "DOMAIN";
+f.element[2].label = "Host Name";
+f.element[2].name = "HOSTNAME";
+f.element[3].label = "Administrator Password";
+f.element[3].name = "ADMINPASS";
+f.element[4].label = "Domain SID";
+f.element[4].name = "DOMAINSID";
+f.element[5].label = "Host GUID";
+f.element[5].name = "HOSTGUID";
+f.element[6].label = "Base DN";
+f.element[6].name = "BASEDN";
+f.element[7].label = "Host IP";
+f.element[7].name = "HOSTIP";
+f.element[8].label = "Default Site";
+f.element[8].name = "DEFAULTSITE";
+f.submit[0] = "Provision";
+f.submit[1] = "Cancel";
+
+if (form['submit'] == "Cancel") {
+ redirect("/");
+}
+
+if (form['submit'] == "Provision") {
+ for (r in form) {
+ subobj[r] = form[r];
+ }
+}
+
+for (i=0;i<f.element.length;i++) {
+ f.element[i].value = subobj[f.element[i].name];
+}
+if (form['submit'] == "Provision") {
+ provision(subobj, writefln);
+} else {
+ display_form(f);
+}
+%>
+
+
+<% page_footer(); %>
Modified: branches/SAMBA_4_0/swat/menu.js
===================================================================
--- branches/SAMBA_4_0/swat/menu.js 2005-07-19 10:15:10 UTC (rev 8597)
+++ branches/SAMBA_4_0/swat/menu.js 2005-07-19 11:06:12 UTC (rev 8598)
@@ -8,4 +8,5 @@
"NBT Server", session_uri("/nbt_server/"),
"WINS Server", session_uri("/wins_server/"),
"Kerberos Server", session_uri("/kdc_server/"),
+ "Installation", session_uri("/install/"),
"ESP Tests", session_uri("/esptest/"));
More information about the samba-cvs
mailing list