July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57815 - /tags/branch-Code-11-2_17_6/pos-installation/
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 10:00:31 2009 New Revision: 57815 URL: http://svn.opensuse.org/viewcvs/yast?rev=57815&view=rev Log: Created tag branch-Code-11-2_17_6 for pos-installation Added: tags/branch-Code-11-2_17_6/pos-installation/ - copied from r57814, branches/SuSE-Code-11-Branch/pos-installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57814 - in /branches/SuSE-Code-11-Branch/pos-installation: VERSION package/yast2-pos-installation.changes src/clients/inst_slepos_detection.ycp
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 10:00:25 2009 New Revision: 57814 URL: http://svn.opensuse.org/viewcvs/yast?rev=57814&view=rev Log: - save the content of input boxes (bnc#518061) - 2.17.6 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Wed Jul 1 10:00:25 2009 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Wed Jul 1 10:00:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 1 09:45:01 CEST 2009 - jsuchome(a)suse.cz + +- save the content of input boxes (bnc#518061) +- 2.17.6 + +------------------------------------------------------------------- Wed Jul 1 08:38:37 CEST 2009 - jsuchome(a)suse.cz - updated the help text (bnc#517717) Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp Wed Jul 1 10:00:25 2009 @@ -60,7 +60,9 @@ */ term cont = `RadioButtonGroup (`id ("migration_data"), `opt (`notify), `VBox ( - `Left (`RadioButton (`id ("rb_file"), `opt (`notify), _("Path to archive file"))), + `Left ( + // radio button label + `RadioButton (`id ("rb_file"), `opt (`notify), _("Path to archive file"), file_path != "")), `HBox ( `HSpacing (3), `HBox ( @@ -69,7 +71,7 @@ ) ), `VSpacing (), - `Left (`RadioButton (`id ("rb_dir"), `opt (`notify), _("Path to backup directory"))), + `Left (`RadioButton (`id ("rb_dir"), `opt (`notify), _("Path to backup directory"), dir_path != "")), `HBox ( `HSpacing (3), `HBox ( @@ -137,9 +139,15 @@ // FIXME validate // reset the possible value of the string which won't be used if (UI::QueryWidget (`id ("migration_data"), `Value) == "rb_file") + { + file_path = (string) UI::QueryWidget (`id ("file_path"), `Value); dir_path = ""; + } else + { + dir_path = (string) UI::QueryWidget (`id ("dir_path"), `Value); file_path = ""; + } POSInstallation::dir_path = dir_path; POSInstallation::file_path = file_path; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] rest-service : branch, master, updated.
by git version control 01 Jul '09

01 Jul '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "YaST web service". The branch, master has been updated via 168a9b41e7fa79ddfc5f925452050f9c5be7e2e1 (commit) via ce4c229bf67a7607b57208f9e39e4ef7077dce52 (commit) from b602a5bf3598020b329faf39501c30e9d677a199 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 168a9b41e7fa79ddfc5f925452050f9c5be7e2e1 Author: Jiri Suchomel <jsuchome(a)suse.cz> Date: Wed Jul 1 08:52:35 2009 +0200 more changes in CLI->DBUS transfer commit ce4c229bf67a7607b57208f9e39e4ef7077dce52 Author: Jiri Suchomel <jsuchome(a)suse.cz> Date: Wed Jul 1 08:52:11 2009 +0200 new policy file, based on YaPI ----------------------------------------------------------------------- Summary of changes and diff: plugins/users/app/controllers/users_controller.rb | 61 ++++++++++++-------- plugins/users/config/resources/users.yml | 2 +- .../org.opensuse.yast.modules.yapi.users.policy | 32 ++++++++++- .../package/org.opensuse.yast.system.users.policy | 47 --------------- 4 files changed, 67 insertions(+), 75 deletions(-) delete mode 100644 plugins/users/package/org.opensuse.yast.system.users.policy diff --git a/plugins/users/app/controllers/users_controller.rb b/plugins/users/app/controllers/users_controller.rb index 5adb167..e71ae28 100644 --- a/plugins/users/app/controllers/users_controller.rb +++ b/plugins/users/app/controllers/users_controller.rb @@ -61,6 +61,7 @@ class UsersController < ApplicationController ]] } user_map = YastService.Call("YaPI::USERS::UserGet", parameters) + # TODO check if it is not empty @user = User.new # FIXME adapt the model to the YaPI return map @user.login_name = id @@ -141,31 +142,41 @@ class UsersController < ApplicationController end def add_user - command = ["/sbin/yast2", "users", "add"] - command << "cn=\"#{(a)user.full_name}\"" if not @user.full_name.blank? - if not @user.groups.blank? - grp_string = @user.groups.map { |group| group[:id] }.join(',') - command << "grouplist=#{grp_string}" - end - command << "gid=#{(a)user.default_group}" if not @user.default_group.blank? - command << "home=#{(a)user.home_directory}" if not @user.home_directory.blank? - command << "shell=#{(a)user.login_shell}" if not @user.login_shell.blank? - command << "username=#{(a)user.login_name}" if not @user.login_name.blank? - command << "uid=#{(a)user.uid}" if not @user.uid.blank? - command << "password=#{(a)user.password}" if not @user.password.blank? - command << "ldap_password=#{(a)user.ldap_password}" if not @user.ldap_password.blank? - command << "no_home" if not @user.no_home.blank? and @user.no_home.eql?('true') - command << "type=#{(a)user.type}" if not @user.type.blank? - command << "batchmode" +# command = ["/sbin/yast2", "users", "add"] +# command << "cn=\"#{(a)user.full_name}\"" if not @user.full_name.blank? +# if not @user.groups.blank? +# grp_string = @user.groups.map { |group| group[:id] }.join(',') +# command << "grouplist=#{grp_string}" +# end +# command << "gid=#{(a)user.default_group}" if not @user.default_group.blank? +# command << "home=#{(a)user.home_directory}" if not @user.home_directory.blank? +# command << "shell=#{(a)user.login_shell}" if not @user.login_shell.blank? +# command << "username=#{(a)user.login_name}" if not @user.login_name.blank? +# command << "uid=#{(a)user.uid}" if not @user.uid.blank? +# command << "password=#{(a)user.password}" if not @user.password.blank? +# command << "ldap_password=#{(a)user.ldap_password}" if not @user.ldap_password.blank? +# command << "no_home" if not @user.no_home.blank? and @user.no_home.eql?('true') +# command << "type=#{(a)user.type}" if not @user.type.blank? +# command << "batchmode" + + # FIXME mandatory parameters must be required on web-client side... + config = { + "type" => [ "s", "local" ] + } + data = { + "uid" => [ "s", @user.login_name ] + } + data["cn"] = [ "s", @user.full_name ] unless @user.full_name.blank? + data["userPassword"] = [ "s", @user.password ] unless @user.password.blank? - ret = @scr.execute(command) + ret = YastService.Call("YaPI::USERS::UserAdd", config, data) logger.debug "Command returns: #{ret.inspect}" - return true if ret[:exit] == 0 + return true if ret == "" - @error_id = ret[:exit] - @error_string = ret[:stderr] +# @error_id = ret[:exit] FIXME + @error_string = ret return false end @@ -197,7 +208,7 @@ class UsersController < ApplicationController # GET /users.xml # GET /users.json def index - unless permission_check( "org.opensuse.yast.system.users.read") + unless permission_check("org.opensuse.yast.modules.yapi.users.usersget") render ErrorResult.error(403, 1, "no permission") and return end get_user_list @@ -206,7 +217,7 @@ class UsersController < ApplicationController # GET /users/1 # GET /users/1.xml def show - unless permission_check( "org.opensuse.yast.system.users.read") + unless permission_check("org.opensuse.yast.modules.yapi.users.userget") render ErrorResult.error(403, 1, "no permission") and return end if params[:id].blank? @@ -222,7 +233,7 @@ class UsersController < ApplicationController # POST /users.xml # POST /users.json def create - unless permission_check( "org.opensuse.yast.system.users.new") + unless permission_check("org.opensuse.yast.modules.yapi.users.useradd") render ErrorResult.error(403, 1, "no permission") and return end @@ -241,7 +252,7 @@ class UsersController < ApplicationController # PUT /users/1 # PUT /users/1.xml def update - unless permission_check( "org.opensuse.yast.system.users.write") + unless permission_check("org.opensuse.yast.modules.yapi.users.usermodify") render ErrorResult.error(403, 1, "no permission") and return end @user = User.new @@ -264,7 +275,7 @@ class UsersController < ApplicationController # DELETE /users/1.xml # DELETE /users/1.json def destroy - unless permission_check( "org.opensuse.yast.system.users.delete") + unless permission_check("org.opensuse.yast.modules.yapi.users.userdelete") render ErrorResult.error(403, 1, "no permission") and return end get_user params[:id] diff --git a/plugins/users/config/resources/users.yml b/plugins/users/config/resources/users.yml index 4eeb2be..072c15a 100644 --- a/plugins/users/config/resources/users.yml +++ b/plugins/users/config/resources/users.yml @@ -1,2 +1,2 @@ -interface: org.opensuse.yast.system.users +interface: org.opensuse.yast.modules.yapi.users controller: users diff --git a/plugins/users/package/org.opensuse.yast.modules.yapi.users.policy b/plugins/users/package/org.opensuse.yast.modules.yapi.users.policy index 8353be0..4bd03ab 100644 --- a/plugins/users/package/org.opensuse.yast.modules.yapi.users.policy +++ b/plugins/users/package/org.opensuse.yast.modules.yapi.users.policy @@ -9,7 +9,6 @@ <action id="org.opensuse.yast.modules.yapi.users.usersget"> <description>Get list of users.</description> <message>System policy prevents the Yast DBus service from reading users.</message> - <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> @@ -20,12 +19,41 @@ <action id="org.opensuse.yast.modules.yapi.users.userget"> <description>Get the information about given user.</description> <message>System policy prevents the Yast DBus service from reading user info.</message> - <defaults> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> <allow_active>auth_admin_keep_session</allow_active> </defaults> </action> + + <action id="org.opensuse.yast.modules.yapi.users.usermodify"> + <description>Update user settings</description> + <message>Authentication is required to update user settings</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>no</allow_active> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + + <action id="org.opensuse.yast.modules.yapi.users.useradd"> + <description>Add a new user account</description> + <message>Authentication is required to add a new user account</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>no</allow_active> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + + <action id="org.opensuse.yast.modules.yapi.users.userdelete"> + <description>Delete a new account</description> + <message>Authentication is required to delete a user account</message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>no</allow_active> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> </policyconfig> diff --git a/plugins/users/package/org.opensuse.yast.system.users.policy b/plugins/users/package/org.opensuse.yast.system.users.policy deleted file mode 100644 index f0d1a37..0000000 --- a/plugins/users/package/org.opensuse.yast.system.users.policy +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> -<policyconfig> - - <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/YAST</vendor_url> - - - - <action id="org.opensuse.yast.system.users.read"> - <description>Reading user settings</description> - <message>Authentication is required to read user settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.system.users.write"> - <description>Update user settings</description> - <message>Authentication is required to update user settings</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.system.users.new"> - <description>Add a new user account</description> - <message>Authentication is required to add a new user account</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - <action id="org.opensuse.yast.system.users.delete"> - <description>Delete a new account</description> - <message>Authentication is required to delete a user account</message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - -</policyconfig> \ No newline at end of file hooks/post-receive -- YaST web service -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57813 - /tags/branch-Code-11-2_17_5/pos-installation/
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 08:47:20 2009 New Revision: 57813 URL: http://svn.opensuse.org/viewcvs/yast?rev=57813&view=rev Log: Created tag branch-Code-11-2_17_5 for pos-installation Added: tags/branch-Code-11-2_17_5/pos-installation/ - copied from r57812, branches/SuSE-Code-11-Branch/pos-installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57812 - in /branches/SuSE-Code-11-Branch/pos-installation: ./ package/ src/clients/
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 08:47:14 2009 New Revision: 57812 URL: http://svn.opensuse.org/viewcvs/yast?rev=57812&view=rev Log: - updated the help text (bnc#517717) - 2.17.5 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Wed Jul 1 08:47:14 2009 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Wed Jul 1 08:47:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 1 08:38:37 CEST 2009 - jsuchome(a)suse.cz + +- updated the help text (bnc#517717) +- 2.17.5 + +------------------------------------------------------------------- Tue Jun 30 11:49:04 CEST 2009 - jsuchome(a)suse.cz - detection script called directly from y2update directory Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_detection.ycp Wed Jul 1 08:47:14 2009 @@ -81,8 +81,15 @@ cont = `HBox (`HSpacing (3), cont, `HSpacing (3)); // help text - string help = _("Enter EITHER nlpos9 migration data, OR SLES11 offline data (whatever it is).... - Or nothing, if you don't understand the request."); + string help = _("In case you are not migrating from NLPOS9 and this is a new SLEPOS 11 +installation continue by clicking Next.") + + + // help text, cont. + _("To migrate from NLPOS9 insert the backed up archive file or backup directory +into the corresponding input box and continue by clicking Next. +The backup file or directory is prepared beforehand using the script <tt>nlpos9_backup_data.sh</tt> +which can be found on the SLEPOS CD in the directory <tt>/migration/</tt> or in the directory +<tt>/usr/lib/SLEPOS/migration</tt> of <tt>POS_Migration.rpm</tt> package."); // Dialog caption Wizard::SetContentsButtons (_("Entering Migration Data"), cont, help, Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp Wed Jul 1 08:47:14 2009 @@ -114,7 +114,8 @@ _("POS Data Migration"), cont, // TRANSLATORS: Dialog help - _("FIXME"), + _("The progress bar indicates the separate migration steps. The complete log +of the migration is saved and will be shown in case of migration failure."), Label::BackButton(), Label::NextButton() ); Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Wed Jul 1 08:47:14 2009 @@ -30,7 +30,6 @@ list <map <string, string> > list_of_patterns = [ $[ // TRANSLATORS: A name of pattern, used as CheckBox label -// "label" : _("Admin Server Installation"), "label" : _("Admin Server"), "name" : "SLEPOS_Server_Admin", "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-host.png", @@ -230,27 +229,13 @@ _("Server Pattern Selection"), cont, -/* FIXME help text podle: - tedy ten dialog je spis pro upresneni toho co uzivatel nechce migrovat a u toho co chce navic se spis pocita ze se doinstaluji jen prislusne patterny + // help text + _("Choose the pattern which you want to install. You may disable the migration +of the relevant deployment (AS, BS or IS).") + + + // help text, cont. + _("The installation will start upon pressing Next."), -(13:31:59) Petr Ostadal: takze dialog pokryva obe varianty , jen me ted napadlo, ze by bylo zajimave pridat do zavorky oonformaci, zda jde o migraci ci "cistou" instalaci AS, BS ci IS... -(13:32:46) jsuchome: no, co uzivatel zaskrtne, to je jen instalace, to co bylo prednastavene je migrace -(13:33:15) jsuchome: otazka je, kdy by se to dalo vyznacit, jak klikne na next tak ten dialog zmizi -(13:33:25) Petr Ostadal: vypadalo by to treba takto: o Admin Server (migration) - checked -o Branch Server (instalation) - not checked -o Image server (migration) - checked -(13:33:28) jsuchome: myslim, ze je to potreba vysvetlit v help textu -(13:33:52) jsuchome: aha, jako ze by to by ty labely byly predem pripravene -(13:34:01) Petr Ostadal: ano -(13:34:10) jsuchome: no, ale to je dost zmatek -(13:34:35) Petr Ostadal: mozna ta instalace by tam napsana byt ani nemusela -*/ - - // TRANSLATORS: Dialog help - _("Please choose what type of server you would like to install and - press Next. - The installation will start upon pressing Next. - "), Label::BackButton(), Label::NextButton() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0