From: hickert Date: Mon, 17 May 2010 10:55:36 +0000 (+0000) Subject: Updated migration step X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3439d0c0bcd590fe11932bb569728d3dbba16861;p=gosa.git Updated migration step git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18509 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc index 17b9fc2c5..fa0abbc86 100644 --- a/gosa-core/setup/class_setupStep_Migrate.inc +++ b/gosa-core/setup/class_setupStep_Migrate.inc @@ -469,7 +469,7 @@ class Step_Migrate extends setup_step $people_ou = "ou=people,"; // Thats the property default. $dn = "cn=System Administrator-".$uid.",".$people_ou.$cv['base']; - $hash = $hash = passwordMethod::make_hash($pw2, 'crypt/standard-des'); + $hash = $hash = passwordMethod::make_hash($pw2, 'crypt/md5'); $new_user=array(); $new_user['objectClass']= array("top","person","gosaAccount","organizationalPerson","inetOrgPerson"); diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl index f7666dd75..97c326948 100644 --- a/gosa-core/setup/setup_migrate.tpl +++ b/gosa-core/setup/setup_migrate.tpl @@ -63,223 +63,6 @@ - {elseif $method == "outside_winstations"} - -

{t}Move windows workstations into a valid windows workstation department{/t}

- - {t}This dialog allows you to move the displayed windows workstations into a valid department{/t} -
- {t}Be careful with this tool, there may be references pointing to this workstations that can't be migrated.{/t} -
-
- - {foreach from=$outside_winstations item=val key=key} - {if $outside_winstations.$key.selected} - - {else} - - {/if} - -  {$outside_winstations.$key.dn} - {if $outside_winstations.$key.ldif != ""} -
-
- 
-								{$outside_winstations.$key.ldif}
-
-
-
- {/if} -
- {/foreach} - - {t}Select all{/t} -

- {t}Move selected windows workstations into the following GOsa department{/t} : - -
- - - - -

- - -
-
- - -
- - - {elseif $method == "outside_groups"} - -

{t}Move groups into configured group tree{/t}

- -

- {t}This dialog allows moving a couple of groups to the configured group tree. Doing this may straighten your LDAP service.{/t} -

-

- {t}Be careful with this option! There may be references pointing to these groups. The GOsa setup can't migrate references, so you may want to cancel the migration in this case.{/t} -

-

- {t}Move selected groups into this group tree{/t}: - -

- - {foreach from=$outside_groups item=val key=key} - {if $outside_groups.$key.selected} - - {else} - - {/if} - -  {$outside_groups.$key.dn} - {if $outside_groups.$key.ldif != "" && $group_details} -
-
-
-{$outside_groups.$key.ldif}
-
-
-
- {/if} -
- {/foreach} - - - {t}Select all{/t} -
-

- {if $group_details} - - - {else} - - - {/if} -

- -
-
- - -   - - -
- - {elseif $method == "outside_users"} - -

{t}Move users into configured user tree{/t}

-

- {t}This dialog allows moving a couple of users to the configured user tree. Doing this may straighten your LDAP service.{/t} -

-

- {t}Be careful with this option! There may be references pointing to these users. The GOsa setup can't migrate references, so you may want to cancel the migration in this case.{/t} -

-

- {t}Move selected users into this people tree{/t}: - -

- {foreach from=$outside_users item=val key=key} - {if $outside_users.$key.selected} - - {else} - - {/if} - -  {$outside_users.$key.dn} - {if $outside_users.$key.ldif != "" && $user_details} -
-
-
-{$outside_users.$key.ldif}
-
-
-
- {/if} -
- {/foreach} - - {t}Select all{/t} -
- - {if $user_details} - - - {else} - - - {/if} - -
-
- - -   - - -
- - - {elseif $method == "migrate_acls"} -

{t}Migrate GOsa 2.5 administrative accounts{/t}

-

- {t}This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 useable accounts.{/t} -

- - - - - - {foreach from=$migrateable_users item=item key=key} - - - - - {/foreach} -
{$item.dn}
- - {if !$details} - - - - {else} - - -
-
- {t}Current{/t} -
- 
{$migrate_acl_base_entry}
-
- {t}After migration{/t} -
- 
{$migrate_acl_base_entry}{foreach from=$migrateable_users item=item key=key}{if $item.checked}{$item.details}{/if}{/foreach}
-
-
-
- - - {/if} - - - -
-
- - - - -
- {elseif $method == "create_acls"} {if $acl_create_selected != "" && $what_will_be_done_now!=""} @@ -349,269 +132,6 @@ {/if} - {elseif $method == "migrate_deps"} - -

Department migration

- -

{t}The listed departments are currently invisible in the GOsa user interface. If you want to change this for a couple of entries, select them and use the migrate button below.{/t}

-

{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}

- - {foreach from=$deps_to_migrate item=val key=key} - - {if $deps_to_migrate.$key.checked} - - {$deps_to_migrate.$key.dn} - {if $deps_to_migrate.$key.after != ""} -
- -{t}Current{/t} -
-
-dn: {$deps_to_migrate.$key.dn}
-{$deps_to_migrate.$key.before}
-
-
-{t}After migration{/t} -
-
-dn: {$deps_to_migrate.$key.dn}
-{$deps_to_migrate.$key.after}
-
-
-
- {/if} - {else} - - {$deps_to_migrate.$key.dn} - {/if} - -
- {/foreach} - - {t}Select all{/t} -
- - {if $deps_details} - - - {else} - - - {/if} - -
- -
- - -   - - -
- {elseif $method == "migrate_users"} - -

User migration

- -

{t}The listed users are currently invisible in the GOsa user interface. If you want to change this for a couple of users, just select them and use the 'Migrate' button below.{/t}

-

{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}

- {foreach from=$users_to_migrate item=val key=key} - - {if $users_to_migrate.$key.checked} - - {$users_to_migrate.$key.dn} - {if $users_to_migrate.$key.after != ""} -
- -{t}Current{/t} -
-
-dn: {$users_to_migrate.$key.dn}
-{$users_to_migrate.$key.before}
-
-
-{t}After migration{/t} -
-
-dn: {$users_to_migrate.$key.dn}
-{$users_to_migrate.$key.after}
-
-
-
- {/if} - {else} - - {$users_to_migrate.$key.dn} - {/if} -
- {/foreach} - - {t}Select all{/t} -
- - {if $user_details} - - - {else} - - - {/if} - -
- -
- - -   - - -
- - - {elseif $method == "devices"} - - -

Devices

- -

{t}The listed devices are currently invisible in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}

-

{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}

- {foreach from=$devices item=item key=key} - - {$item.DEVICE_NAME} - - {$item.DN} - - {if $item.DETAILS && $device_details} -
- {t}Current{/t} - 
{$item.CURRENT}
- - - {t}After migration{/t} - 
{$item.AFTER}
-
- {/if} -
- {/foreach} - - {t}Select all{/t} - -
- - {if $device_details} - - - - - {else} - - - {/if} - -
- -
- - -   - - -
- - {elseif $method == "services"} - - -

Services

- -

{t}The listed services are currently invalid for the GOsa version you are going to install. If you want to update a couple of service, just select them and use the 'Migrate' button below.{/t}

-

{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}

- {foreach from=$services item=item key=key} - - {$item.DN} - - {if $item.DETAILS && $service_details} -
- {t}Current{/t} - 
{$item.CURRENT}
- - - {t}After migration{/t} - 
{$item.AFTER}
-
- {/if} -
- {/foreach} - - {t}Select all{/t} - -
- - {if $service_details} - - - - - {else} - - - {/if} - -
- -
- - -   - - -
- - - {elseif $method == "menus"} - - -

Application menus

- -

{t}The listed menus are currently invisible in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}

-

{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}

- {foreach from=$menus item=item key=key} - - {$item.DN} - - {if $item.DETAILS && $menu_details} -
- {t}Current{/t} - 
{$item.CURRENT}
- - - {t}After migration{/t} - 
{$item.AFTER}
-
- {/if} -
- {/foreach} - - {t}Select all{/t} - -
- - {if $menu_details} - - - - - {else} - - - {/if} - -
- -
- - -   - - -
{/if}