Merge branch 'VCL-1116_use_database_hostnames_for_ad_joined_computers' into develop
diff --git a/CHANGELOG b/CHANGELOG
index 46cdda5..c63b40e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,53 @@
+ASF VCL 2.5.1
+
+Dependency changes:
+
+VCL Management Node:
+* updated supported versions of CentOS and Red Hat
+
+Release Notes - VCL - Version 2.5.1
+
+** Bug
+ * [VCL-1079] - Virtual Hosts page references Computer Utilities
+ * [VCL-1080] - Wrong port can be delivered in RDP file
+ * [VCL-1081] - UID conflict for admin user
+ * [VCL-1082] - monitor_vcld.pl throws incorrect lastcheckin time exception after Daylight Savings Time Roles Back
+ * [VCL-1083] - Data in shares mounted under Linux home directories may be deleted
+ * [VCL-1093] - vSphere_SDK.pm:vm_unregister - failed to unregister VM:
+ * [VCL-1100] - block allocation usage graph does not work correctly for allocations with a single time slot
+ * [VCL-1103] - change vcldsemaphore.pid from smallint to mediumint
+ * [VCL-1105] - Shibboleth authentication broken due to bug in getCryptKeyID
+ * [VCL-1111] - statgraphcache table not correctly being used
+ * [VCL-1113] - image capture for Windows system configured as domain controller fails
+ * [VCL-1116] - use database hostnames for ad joined computers
+ * [VCL-1117] - vcld fails to set fixed IP address for Linux server reservations if management node not set to static
+ * [VCL-1119] - wrong day submitted for future reservations made in the evening
+ * [VCL-1120] - image conversion from vmdk to qcow2 always done twice
+
+** New Feature
+ * [VCL-1112] - SSL Offload
+
+** Improvement
+ * [VCL-1041] - Customer facing email notifications are ugly
+ * [VCL-1084] - set cache mode for libvirt VMs
+ * [VCL-1085] - Configuring VCL Website to use custom port
+ * [VCL-1089] - Change ping module to use Net::Ping::External
+ * [VCL-1092] - Change installation script to install these RPM Perl Modules
+ * [VCL-1094] - add .\ to windows user login to prevent automatic use of Microsoft accounts
+ * [VCL-1095] - Move unjoining of Windows VMs from Active Directory to earlier in the deprovision process
+ * [VCL-1096] - Add ability to automatically mount NFS shares under Windows
+ * [VCL-1101] - Change chmod mode from string to octal number value
+ * [VCL-1104] - set cpu topology for libvirt VMs
+ * [VCL-1106] - make PHP code compatible with PHP 7
+ * [VCL-1109] - date duplicated on statistic graph labels for day after daylight saving time rolls back
+ * [VCL-1110] - expose maxinitial time for images in web UI
+ * [VCL-1114] - miscellaneous small web updates
+
+** Task
+ * [VCL-1097] - add hidden files to empty directories to force them to be included in Git repo
+
+================================================================================
+
ASF VCL 2.5
Dependency changes:
diff --git a/INSTALLATION b/INSTALLATION
index c5583e8..f6f4a62 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -1,10 +1,10 @@
-Installing VCL 2.5
+Installing VCL 2.5.1
-VCL 2.5 is the second release to include an installation script. All you need
-to install VCL is the script. It will download and validate the VCL software and
-then install it. The script can be used to install all three parts of VCL
-(database, web portal, and management node) on a single system or to install
-each part individually on separate systems.
+VCL 2.5.1 can be installed using an installation script. All you need to
+install VCL is the script. It will download and validate the VCL software
+and then install it. The script can be used to install all three parts of
+VCL (database, web portal, and management node) on a single system or to
+install each part individually on separate systems.
Running the installation script with no arguments will step you through
installing all three parts of VCL.
@@ -52,7 +52,7 @@
-MINUAL INSTALLATION INSTRUCTIONS
+MANUAL INSTALLATION INSTRUCTIONS
The recommended method of installing VCL is to use the installation script. See
above for additional information. If manual installation is required,
@@ -145,7 +145,7 @@
Import the vcl.sql file into the database. The vcl.sql file is included in
the mysql directory within the Apache VCL source code
- mysql vcl < apache-VCL-2.5/mysql/vcl.sql
+ mysql vcl < apache-VCL-2.5.1/mysql/vcl.sql
2. Install and Configure the Web Components
@@ -155,8 +155,8 @@
Web Server:
- Apache HTTP Server v1.3 or v2.x with SSL enabled
- PHP 5.0 or later
+ Apache HTTP Server v2.x with SSL enabled
+ PHP 5.x or 7.x
Required Linux Packages:
@@ -167,12 +167,13 @@
Required PHP Modules:
php
+ php-gettext
php-json (required if your PHP version is 5.2 or later)
+ php-ldap (if you will be using LDAP authentication)
php-mysql
php-openssl
php-xml
php-xmlrpc
- php-ldap (if you will be using LDAP authentication)
A. Install the Required Linux Packages & PHP Modules
@@ -225,14 +226,14 @@
Copy the web directory to a location under the web root of your web
server and navigate to the destination .ht-inc subdirectory:
- cp -ar apache-VCL-2.5/web/ /var/www/html/vcl-2.5
- ln -s /var/www/html/vcl-2.5 /var/www/html/vcl
+ cp -ar apache-VCL-2.5.1/web/ /var/www/html/vcl-2.5.1
+ ln -s /var/www/html/vcl-2.5.1 /var/www/html/vcl
cd /var/www/html/vcl/.ht-inc
If SELinux is enabled, run the following command to set the context of the
web code to httpd_sys_content_t
- chcon -R -t httpd_sys_content_t /var/www/html/vcl-2.5
+ chcon -R -t httpd_sys_content_t /var/www/html/vcl-2.5.1
Copy secrets-default.php to secrets.php:
@@ -353,8 +354,8 @@
Prerequisites The following management node installation instructions assume
the instructions in these previous sections have been completed:
- VCL 2.5 Database Installation
- VCL 2.5 Web Code Installation
+ VCL 2.5.1 Database Installation
+ VCL 2.5.1 Web Code Installation
Supported Operating Systems:
@@ -392,11 +393,12 @@
The VCL management node daemon (vcld) is written in Perl and has been tested
on Perl 5.10 and 5.16. The following Perl modules available from CPAN are
- also required (see step 2 below for installation instructions):
+ also required (see step B below for installation instructions):
Crypt::CBC - implementation of the cryptographic cipher block chaining mode
Crypt::OpenSSL::RSA - RSA encoding and decoding, using the openSSL libraries
Crypt::Rijndael - Crypt::CBC compliant Rijndael encryption module
+ DBD::MySQL - MySQL driver for the Perl5 Database Interface (DBI)
DBI - Generic Database Interface
Digest::SHA1 - NIST SHA message digest algorithm
Exception::Class::Base - base class for exception objects
@@ -408,6 +410,7 @@
Mail::Mailer - Simple mail agent interface
Net::Jabber - Jabber perl library
Net::Netmask - parse, manipulate and lookup IP network blocks
+ Net::Ping::External - Cross-platform Perl interface to "ping" utilities
Net::SSH::Expect - a wrapper to the ssh executable that is available in
system's PATH
Object::InsideOut - Comprehensive inside-out object support
@@ -421,8 +424,8 @@
Copy the managementnode directory to the location where you want it to
reside (typically /usr/local):
- cp -ar apache-VCL-2.5/managementnode /usr/local/vcl-2.5
- ln -s /usr/local/vcl-2.5 /usr/local/vcl
+ cp -ar apache-VCL-2.5.1/managementnode /usr/local/vcl-2.5.1
+ ln -s /usr/local/vcl-2.5.1 /usr/local/vcl
B. Install the Required Linux Packages & Perl Modules
diff --git a/README b/README
index 22dbd62..9a0062e 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-Apache VCL 2.5
+Apache VCL 2.5.1
================================================================================
INSTALLATION
Please see the INSTALLATION file or the installation guide on the Apache VCL
-website. (http://vcl.apache.org/docs/VCL25InstallGuide.html)
+website. (http://vcl.apache.org/docs/VCL251InstallGuide.html)
================================================================================
SYSTEM REQUIREMENTS
@@ -14,7 +14,7 @@
------------
VCL web server Linux packages:
-* Apache HTTP Server v1.3 or v2.x with SSL enabled
+* Apache HTTP Server v2.x with SSL enabled
* PHP 5.0 or later
VCL web server PHP modules:
@@ -40,8 +40,7 @@
VCL has been tested on the following operating systems:
* CentOS release 6.9 (Final)
-* CentOS Linux release 7.3.1611 (Core)
-* Red Hat Enterprise Linux Server release 6.8 (Santiago)
+* CentOS Linux release 7.6.1810 (Core)
* Red Hat Enterprise Linux Server release 7.3 (Maipo)
Required Linux Packages:
@@ -72,6 +71,7 @@
* Crypt::CBC
* Crypt::OpenSSL::RSA
* Crypt::Rijndael
+* DBD::MySQL
* DBI
* Digest::SHA1
* Exception::Class::Base
@@ -83,6 +83,7 @@
* Mail::Mailer
* Net::Jabber
* Net::Netmask
+* Net::Ping::External
* Net::SSH::Expect
* Object::InsideOut
* RPC::XML::Client
@@ -119,21 +120,11 @@
http://www.vmware.com/support/developer/viperltoolkit/
This is not required if provisioning virtual machines on standalone VMware ESX
or ESXi hosts.
-* Windows XP & Windows Server 2003 bare-metal provisioning
- The Sysprep utility is required to provision Windows XP and Windows Server
- 2003 bare-metal images. The utility can be downloaded from Microsoft. It is
- included in newer versions of Windows. Sysprep is not required to provision
- virtual machine images.
-* Jabber notifications
- VCL has the ability to send instant message notifications using Jabber. This
- feature is optional and can be enabled or disabled by configuring the
- "jabber=[yes|no]" property in the vcld.conf file. If the Jabber notification
- feature is enabled, the Net::Jabber Perl module is required.
================================================================================
BUNDLED 3RD PARTY SOFTWARE
-A copy of Dojo Toolkit version 1.6.2 is included in under web/dojo.
+A copy of Dojo Toolkit version 1.6.5 is included in under web/dojo.
Portions of the phpseclib (http://phpseclib.sourceforge.net) project are
included under web/.ht-inc/phpseclib.
@@ -178,4 +169,4 @@
The backend management node code also uses the SSH protocol and public key
authentication to connect to and control compute nodes provisioned by a VCL
management node server as well as other hosts that comprise a VCL system such as
-hypervisors.
\ No newline at end of file
+hypervisors.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 8b0afa5..ed3c0a8 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-VCL 2.5
+VCL 2.5.1
I. Intro and Description
@@ -21,27 +21,12 @@
II. Notable Changes
-The following are some notable changes from previous releases.
+This is primarily a bug fix release. However, the following are some
+changes worth highlighting.
-Added:
-
-* Support for Windows 10 and Windows Server 2016 images
-* Responsive theme (dropdownmenus) to web site
-* Support for automatically joining Windows images to an Active Directory domain
-* Basic automatic mounting of NFS shares for all users
-* Customization of email messages sent to users on a per-affiliation basis
-* Support for the automatic configuration of ufw and firewalld-based firewalls
- within Linux images
-* Support for NAT hosts which use ufw os firewalld-based firewalls including
- Ubuntu and RedHat/CentOS 7 and later
-* Support for the execution of custom scripts on a management node at various
- stages of the reservation
-* Display of reservation times in the user's own timezone
-
-Removed:
-
-* Server Profiles
-* Use of the Windows Administrator user account for imaging reservations
+* PHP code updated to work with PHP 7.x.
+* Rudimentary NFS file share mounting extended to work with Windows
+* Added method for using HTML in user emails through external script
=================================
@@ -84,7 +69,9 @@
If you find a bug, please submit a bug report to our JIRA bug tracking system at
http://issues.apache.org/jira/browse/VCL (you will need to set up an account
-there if you haven't already done so - it's free to anyone).
+there if you haven't already done so - it's free to anyone). If it is a security
+bug, do not open a JIRA issue. Instead report it in an email to
+security@apache.org.
If you would like to requrest a new feature, you can also submit that in the
same way through JIRA (just select "New Feature" or "Improvement" as the Issue
diff --git a/UPGRADE b/UPGRADE
index 4256ad1..6b0d8d1 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,10 +1,10 @@
-Upgrading to VCL 2.5
+Upgrading to VCL 2.5.1
-VCL 2.5 is the second release to include an upgrade script. All you need to
-upgrade VCL is the script. It will download and validate the VCL software and
-then upgrade your system. The script can be used to upgrade all three parts of
-VCL (database, web portal, and management node) or to upgrade each part
-individually.
+VCL 2.5.1 can be upgraded using an upgrade script. All you need to upgrade
+VCL is the script. It will download and validate the VCL software and then
+upgrade your system. The script can be used to upgrade all three parts of
+VCL (database, web portal, and management node) on a single system or to
+upgrade each part individually on separate systems.
Running the upgrade script with no arguments will step you through upgrading
all three parts of VCL.
@@ -57,101 +57,93 @@
2. Create a backup of the VCL database. This will provide a restore point if
necessary.
- mysqldump vcl > ~/vcl-pre2.5-upgrade.sql
+ mysqldump vcl > ~/vcl-pre2.5.1-upgrade.sql
3. Updates the database schema.
- mysql vcl < /root/apache-VCL-2.5/mysql/update-vcl.sql
+ mysql vcl < /root/apache-VCL-2.5.1/mysql/update-vcl.sql
4. Possibly move old web code. If /var/www/html/vcl is a directory, rename it
- to /var/www/html/vcl-2.4.2. These instructions assume that you installed the
+ to /var/www/html/vcl-2.5. These instructions assume that you installed the
VCL web code at /var/www/html/vcl. If you installed it elsewhere, replace
/var/www/html/vcl with your vcl web root.
- mv /var/www/html/vcl /var/www/html/vcl-2.4.2
+ mv /var/www/html/vcl /var/www/html/vcl-2.5
5. Disable access to the old web code
- echo "Require all denied" > /var/www/html/vcl-2.4.2/.htaccess
+ echo "Require all denied" > /var/www/html/vcl-2.5/.htaccess
6. Copy the new code in place
- cp -ar /root/apache-VCL-2.5/web /var/www/html/vcl-2.5
- ln -sfn /var/www/html/vcl-2.5 /var/www/html/vcl
+ cp -ar /root/apache-VCL-2.5.1/web /var/www/html/vcl-2.5.1
+ ln -sfn /var/www/html/vcl-2.5.1 /var/www/html/vcl
- 7. Copy your 2.4.2 config files
+ 7. Copy your 2.5 config files
- cd /var/www/html/vcl-2.4.2/.ht-inc
+ cd /var/www/html/vcl-2.5/.ht-inc
cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc
+ cp cryptkey/cryptkeyid cryptkey/private.pem /var/www/html/vcl/.ht-inc/cryptkey/
8. If you are using SELinux, set the correct context:
- chcon -R -t httpd_sys_content_t /var/www/html/vcl-2.5
- chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5/.ht-inc/maintenance
- chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5/.ht-inc/cryptkey
+ chcon -R -t httpd_sys_content_t /var/www/html/vcl-2.5.1
+ chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5.1/.ht-inc/maintenance
+ chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5.1/.ht-inc/cryptkey
- 9. Update conf.php: the following item needs to be removed from the conf.php
+ 9. Update conf.php: the following item needs to be added to the conf.php
file:
(don't forget to edit conf.php in the *new* location)
vim /var/www/html/vcl/.ht-inc/conf.php
- define("MAXVMLIMIT", "100");
+ define("SSLOFFLOAD", 0);
-10. Update secrets.php: $cryptkey in secrets.php needs to be generated using
- openssl. Generate the value and set it in secrets.php:
-
- openssl rand 32 | base64
- vim /var/www/html/vcl/.ht-inc/secrets.php
-
- $cryptkey = 'xxxxxxxxxxxxxxxxxxxxxxxxx'; # set this to output of
- # "openssl rand 32 | base64"
-
-11. Make the maintenance and cryptkey directories writable by the web server
+10. Make the maintenance and cryptkey directories writable by the web server
user. Normally this is the apache user, if using a different user change
below command accordingly.
chown apache /var/www/html/vcl/.ht-inc/maintenance
chown apache /var/www/html/vcl/.ht-inc/cryptkey
-12. Start httpd service
+11. Start httpd service
service httpd start
-13. Check testsetup.php: Check that everything is correct by viewing the
+12. Check testsetup.php: Check that everything is correct by viewing the
testsetup.php script in your browser. This script is located in the same
directory as the index.php script. I.e.
https://your.site.url/vcl/testsetup.php
-14. Copy old management node code:
- If /usr/local/vcl is a directory, copy it to /usr/local/vcl-2.4.2, rename
- /usr/local/vcl to /usr/local/vcl-2.5, and create a symlink.
- If /usr/local/vcl is a symlink to vcl-2.4.2, copy /usr/local/vcl-2.4.2 to
- /usr/local/vcl-2.5 and update the symlink.
+13. Copy old management node code:
+ If /usr/local/vcl is a directory, copy it to /usr/local/vcl-2.5, rename
+ /usr/local/vcl to /usr/local/vcl-2.5.1, and create a symlink.
+ If /usr/local/vcl is a symlink to vcl-2.5, copy /usr/local/vcl-2.5 to
+ /usr/local/vcl-2.5.1 and update the symlink.
(for directory)
- cp -ar /usr/local/vcl /usr/local/vcl-2.4.2
- mv /usr/local/vcl /usr/local/vcl-2.5
- ln -s /usr/local/vcl-2.5 /usr/local/vcl
+ cp -ar /usr/local/vcl /usr/local/vcl-2.5
+ mv /usr/local/vcl /usr/local/vcl-2.5.1
+ ln -s /usr/local/vcl-2.5.1 /usr/local/vcl
(for symlink)
- cp -ar /usr/local/vcl-2.4.2 /usr/local/vcl-2.5
- ln -sfn /usr/local/vcl-2.5 /usr/local/vcl
+ cp -ar /usr/local/vcl-2.5 /usr/local/vcl-2.5.1
+ ln -sfn /usr/local/vcl-2.5.1 /usr/local/vcl
-15. Copy the new management node code over the old code:
+14. Copy the new management node code over the old code:
- /bin/cp -ar /root/apache-VCL-2.5/managementnode/* /usr/local/vcl-2.5
+ /bin/cp -ar /root/apache-VCL-2.5.1/managementnode/* /usr/local/vcl-2.5.1
-16. Run install_perl_libs.pl to add any new perl library requirements:
+15. Run install_perl_libs.pl to add any new perl library requirements:
/usr/local/vcl/bin/install_perl_libs.pl
-17. Start vcld service
+16. Start vcld service
service vcld start
-18. Make some test reservations and watch the vcld.log to verify everything is
+17. Make some test reservations and watch the vcld.log to verify everything is
working correctly.
tail -f /var/log/vcld.log
diff --git a/managementnode/bin/health_check.pl b/managementnode/bin/health_check.pl
index 9af6b7f..4676837 100755
--- a/managementnode/bin/health_check.pl
+++ b/managementnode/bin/health_check.pl
@@ -43,7 +43,7 @@
use base qw();
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/bin/install_perl_libs.pl b/managementnode/bin/install_perl_libs.pl
index a61042d..e946948 100755
--- a/managementnode/bin/install_perl_libs.pl
+++ b/managementnode/bin/install_perl_libs.pl
@@ -63,13 +63,20 @@
'perl-DBD-MySQL',
'perl-DBI',
'perl-Digest-SHA1',
+ 'perl-Expect',
+ 'perl-Frontier-RPC',
+ 'perl-Frontier-RPC-Client',
'perl-IO-String',
'perl-JSON',
+ 'perl-LWP-Protocol-https',
'perl-MailTools',
+ 'perl-Mo',
'perl-Net-Jabber',
'perl-Net-Netmask',
'perl-Net-SSH-Expect',
+ 'perl-Object-InsideOut',
'perl-RPC-XML',
+ 'perl-Scalar-List-Utils',
'perl-Text-CSV_XS',
'perl-Time-HiRes',
'perl-XML-Simple',
@@ -79,21 +86,17 @@
my @PERL_MODULES = (
'CPAN',
- 'DBI',
+ 'Crypt::CBC',
'Digest::SHA1',
'Frontier::Client',
+ 'IO::String',
'LWP::Protocol::https',
- 'Mail::Mailer',
'Mo::builder',
'Net::Ping::External',
'Net::SSH::Expect',
'Object::InsideOut',
- 'RPC::XML',
'Scalar::Util',
- 'Term::ANSIColor',
- 'Time::HiRes',
- 'URI',
- 'YAML',
+ 'Text::CSV_XS',
);
# Store the command line options in hash
diff --git a/managementnode/bin/monitor_vcld.pl b/managementnode/bin/monitor_vcld.pl
index 503df93..9ea636e 100755
--- a/managementnode/bin/monitor_vcld.pl
+++ b/managementnode/bin/monitor_vcld.pl
@@ -53,7 +53,7 @@
use lib "$FindBin::Bin/../lib";
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
use strict;
use warnings;
diff --git a/managementnode/bin/upgrade_database.pl b/managementnode/bin/upgrade_database.pl
index 12cee86..1a6710c 100755
--- a/managementnode/bin/upgrade_database.pl
+++ b/managementnode/bin/upgrade_database.pl
@@ -41,7 +41,7 @@
use lib "$FindBin::Bin/../lib";
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/bin/vcld b/managementnode/bin/vcld
index 5db965d..2dd919c 100755
--- a/managementnode/bin/vcld
+++ b/managementnode/bin/vcld
@@ -43,7 +43,7 @@
use base qw();
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/bin/vclmessages.pl b/managementnode/bin/vclmessages.pl
index 20ae532..caa8458 100755
--- a/managementnode/bin/vclmessages.pl
+++ b/managementnode/bin/vclmessages.pl
@@ -1,4 +1,20 @@
#!/usr/bin/perl -w
+###############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
use Getopt::Long;
use YAML;
diff --git a/managementnode/lib/VCL/DataStructure.pm b/managementnode/lib/VCL/DataStructure.pm
index 1b0bf41..558c09f 100644
--- a/managementnode/lib/VCL/DataStructure.pm
+++ b/managementnode/lib/VCL/DataStructure.pm
@@ -66,7 +66,7 @@
use base qw();
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module.pm b/managementnode/lib/VCL/Module.pm
index 1bbfe7b..ea750fe 100644
--- a/managementnode/lib/VCL/Module.pm
+++ b/managementnode/lib/VCL/Module.pm
@@ -74,7 +74,7 @@
use base qw();
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS.pm b/managementnode/lib/VCL/Module/OS.pm
index 24bacca..32c25cf 100644
--- a/managementnode/lib/VCL/Module/OS.pm
+++ b/managementnode/lib/VCL/Module/OS.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux.pm b/managementnode/lib/VCL/Module/OS/Linux.pm
index 4620b6a..dda70ab 100644
--- a/managementnode/lib/VCL/Module/OS/Linux.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm b/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm
index 4aa5371..dfed945 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm
@@ -44,7 +44,7 @@
use base qw(VCL::Module::OS::Linux);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm b/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm
index c3d0b6b..f4a63a8 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm
@@ -44,7 +44,7 @@
use base qw(VCL::Module::OS::Linux);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm b/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm
index a40564c..a74d74b 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm
@@ -39,7 +39,7 @@
use base qw(VCL::Module::OS::Linux);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm b/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm
index 58a2f41..f0be3fa 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm
@@ -35,7 +35,7 @@
use base qw(VCL::Module::OS::Linux);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall.pm
index 88d89f4..7639ec6 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/firewall.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/firewall.pm
@@ -40,7 +40,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm
index b7f943d..e927498 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm
@@ -39,7 +39,7 @@
use base qw(VCL::Module::OS::Linux::firewall::iptables);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
our @ISA;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm
index 9a526ab..eb28b48 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm
@@ -39,7 +39,7 @@
use base qw(VCL::Module::OS::Linux::firewall);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
our @ISA;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm
index 671b5c6..4b449aa 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm
@@ -39,7 +39,7 @@
use base qw(VCL::Module::OS::Linux::firewall::iptables);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
our @ISA;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/init.pm b/managementnode/lib/VCL/Module/OS/Linux/init.pm
index 07811a1..88faed0 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/init.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/init.pm
@@ -40,7 +40,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm b/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm
index 78f8541..810889a 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm
@@ -42,7 +42,7 @@
use base qw(VCL::Module::OS::Linux::init);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm b/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm
index 64f4ea7..2848b93 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm
@@ -41,7 +41,7 @@
use base qw(VCL::Module::OS::Linux::init);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm b/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm
index fda195e..5d67587 100644
--- a/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm
+++ b/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm
@@ -42,7 +42,7 @@
use base qw(VCL::Module::OS::Linux::init);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/OSX.pm b/managementnode/lib/VCL/Module/OS/OSX.pm
index 80d8e9d..b58e81d 100644
--- a/managementnode/lib/VCL/Module/OS/OSX.pm
+++ b/managementnode/lib/VCL/Module/OS/OSX.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows.pm b/managementnode/lib/VCL/Module/OS/Windows.pm
index a17c35c..a6eac08 100644
--- a/managementnode/lib/VCL/Module/OS/Windows.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
@@ -3938,11 +3938,14 @@
return 0;
}
- # Set sshd service startup mode to auto
+ # Set sshd service startup mode to manual
if (!$self->set_service_startup_mode('sshd', 'manual')) {
notify($ERRORS{'WARNING'}, 0, "reboot not attempted, unable to set sshd service startup mode to manual");
return 0;
}
+ else {
+ notify($ERRORS{'DEBUG'}, 0, "sshd service set to manual start");
+ }
# Make sure ping access is enabled from private IP addresses
if (!$self->firewall_enable_ping_private()) {
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm
index 96b0adb..7558c4a 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm
@@ -40,7 +40,7 @@
use base qw(VCL::Module::OS::Windows::Version_6::8);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm
index 2cc4041..fe34fea 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm
@@ -40,7 +40,7 @@
use base qw(VCL::Module::OS::Windows::Version_6::8);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
index 86f1659..8604168 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
@@ -40,7 +40,7 @@
use base qw(VCL::Module::OS::Windows);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm
index 99c85fc..983213c 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS::Windows::Version_5);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm
index e342966..a85c4a1 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS::Windows::Version_5);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
index 90b9991..8c1089e 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
@@ -45,7 +45,7 @@
use base qw(VCL::Module::OS::Windows);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm
index 624848c..6958575 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS::Windows::Version_6);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm
index 43ff5b2..1a00651 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS::Windows::Version_6);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm
index cd238d0..6d3903b 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS::Windows::Version_6);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
index 1bc88e9..aa9bae8 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
@@ -39,7 +39,7 @@
use base qw(VCL::Module::OS::Windows::Version_6);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm
index d92b0e4..65376df 100644
--- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm
+++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::OS::Windows::Version_6);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Predictive.pm b/managementnode/lib/VCL/Module/Predictive.pm
index d9c2d33..8155757 100644
--- a/managementnode/lib/VCL/Module/Predictive.pm
+++ b/managementnode/lib/VCL/Module/Predictive.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Predictive/Level_0.pm b/managementnode/lib/VCL/Module/Predictive/Level_0.pm
index 9a9d9b1..5596f03 100644
--- a/managementnode/lib/VCL/Module/Predictive/Level_0.pm
+++ b/managementnode/lib/VCL/Module/Predictive/Level_0.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Predictive);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Predictive/Level_1.pm b/managementnode/lib/VCL/Module/Predictive/Level_1.pm
index c60df78..78073e2 100644
--- a/managementnode/lib/VCL/Module/Predictive/Level_1.pm
+++ b/managementnode/lib/VCL/Module/Predictive/Level_1.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Predictive);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Predictive/Level_2.pm b/managementnode/lib/VCL/Module/Predictive/Level_2.pm
index 16dbdaa..5c3983c 100644
--- a/managementnode/lib/VCL/Module/Predictive/Level_2.pm
+++ b/managementnode/lib/VCL/Module/Predictive/Level_2.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Predictive);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning.pm b/managementnode/lib/VCL/Module/Provisioning.pm
index 74157c4..5616bf3 100644
--- a/managementnode/lib/VCL/Module/Provisioning.pm
+++ b/managementnode/lib/VCL/Module/Provisioning.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/Lab.pm b/managementnode/lib/VCL/Module/Provisioning/Lab.pm
index d792a5c..c14398d 100644
--- a/managementnode/lib/VCL/Module/Provisioning/Lab.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/Lab.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
index 7678a0d..bf0f3d0 100644
--- a/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
@@ -47,7 +47,7 @@
use base qw(VCL::Module::Provisioning::VMware::VMware);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
index 2ec1574..c19807c 100644
--- a/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
@@ -49,7 +49,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
index 4878da4..fc67a31 100644
--- a/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
@@ -47,7 +47,7 @@
use base qw(VCL::Module::Provisioning::VMware::VMware);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm
index 24e4559..09086c9 100644
--- a/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm
@@ -46,7 +46,7 @@
use base qw(VCL::Module::Provisioning::VMware::VMware);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/docker.pm b/managementnode/lib/VCL/Module/Provisioning/docker.pm
index e202e3b..b8e380b 100644
--- a/managementnode/lib/VCL/Module/Provisioning/docker.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/docker.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/libvirt.pm b/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
index b38ffff..bee452d 100644
--- a/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
@@ -46,7 +46,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
@@ -1736,6 +1736,13 @@
my $copy_on_write_file_path = $self->get_copy_on_write_file_path();
my $image_type = $self->data->get_vmhost_datastore_imagetype_name();
+ my $vmhost_vmpath = $self->data->get_vmhost_profile_vmpath();
+ my $add_disk_cache = 0;
+ if (! $self->os->nathost_os->is_file_on_local_disk($vmhost_vmpath)) {
+ # set disk cache to none if vmpath on NFS so live migration will work
+ $add_disk_cache = 1;
+ }
+
my $disk_driver_name = $self->driver->get_disk_driver_name();
my $disk_bus_type = $self->get_master_xml_disk_bus_type();
@@ -1912,6 +1919,11 @@
}
]
};
+
+ if ($add_disk_cache) {
+ notify($ERRORS{'DEBUG'}, 0, "vmpath ($vmhost_vmpath) is on NFS; setting disk cache to none");
+ $xml_hashref->{'devices'}[0]{'disk'}[0]{'driver'}{'cache'} = 'none';
+ }
notify($ERRORS{'DEBUG'}, 0, "generated domain XML:\n" . format_data($xml_hashref));
return hash_to_xml_string($xml_hashref, 'domain');
diff --git a/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm b/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm
index e183690..e57cabd 100644
--- a/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm
@@ -42,7 +42,7 @@
use base qw(VCL::Module::Provisioning::libvirt);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/one.pm b/managementnode/lib/VCL/Module/Provisioning/one.pm
index 10df935..d5921d7 100644
--- a/managementnode/lib/VCL/Module/Provisioning/one.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/one.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/openstack.pm b/managementnode/lib/VCL/Module/Provisioning/openstack.pm
index f116a42..b2d2ffc 100644
--- a/managementnode/lib/VCL/Module/Provisioning/openstack.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/openstack.pm
@@ -46,7 +46,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/vbox.pm b/managementnode/lib/VCL/Module/Provisioning/vbox.pm
index f102588..e7ce229 100644
--- a/managementnode/lib/VCL/Module/Provisioning/vbox.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/vbox.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Provisioning/xCAT.pm b/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
index 70eb721..1b06029 100644
--- a/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
@@ -50,7 +50,7 @@
use base qw(VCL::Module::Provisioning);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/Semaphore.pm b/managementnode/lib/VCL/Module/Semaphore.pm
index e6d20bf..61d420c 100644
--- a/managementnode/lib/VCL/Module/Semaphore.pm
+++ b/managementnode/lib/VCL/Module/Semaphore.pm
@@ -50,7 +50,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/Module/State.pm b/managementnode/lib/VCL/Module/State.pm
index 91c6604..24dd539 100644
--- a/managementnode/lib/VCL/Module/State.pm
+++ b/managementnode/lib/VCL/Module/State.pm
@@ -44,7 +44,7 @@
use base qw(VCL::Module);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/blockrequest.pm b/managementnode/lib/VCL/blockrequest.pm
index 7ce9cde..6849f9a 100644
--- a/managementnode/lib/VCL/blockrequest.pm
+++ b/managementnode/lib/VCL/blockrequest.pm
@@ -43,7 +43,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/healthcheck.pm b/managementnode/lib/VCL/healthcheck.pm
index 480c688..3158c1b 100644
--- a/managementnode/lib/VCL/healthcheck.pm
+++ b/managementnode/lib/VCL/healthcheck.pm
@@ -43,7 +43,7 @@
use base qw();
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/image.pm b/managementnode/lib/VCL/image.pm
index 128de2b..9091d1e 100644
--- a/managementnode/lib/VCL/image.pm
+++ b/managementnode/lib/VCL/image.pm
@@ -57,7 +57,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/inuse.pm b/managementnode/lib/VCL/inuse.pm
index bd494b4..3c8dbce 100644
--- a/managementnode/lib/VCL/inuse.pm
+++ b/managementnode/lib/VCL/inuse.pm
@@ -71,7 +71,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/makeproduction.pm b/managementnode/lib/VCL/makeproduction.pm
index b53d9cd..279a78e 100644
--- a/managementnode/lib/VCL/makeproduction.pm
+++ b/managementnode/lib/VCL/makeproduction.pm
@@ -57,7 +57,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/new.pm b/managementnode/lib/VCL/new.pm
index 98f02d1..2573d5a 100644
--- a/managementnode/lib/VCL/new.pm
+++ b/managementnode/lib/VCL/new.pm
@@ -57,7 +57,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/reclaim.pm b/managementnode/lib/VCL/reclaim.pm
index 34d56dd..4321edc 100644
--- a/managementnode/lib/VCL/reclaim.pm
+++ b/managementnode/lib/VCL/reclaim.pm
@@ -57,7 +57,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/reserved.pm b/managementnode/lib/VCL/reserved.pm
index 363331a..6e51d04 100644
--- a/managementnode/lib/VCL/reserved.pm
+++ b/managementnode/lib/VCL/reserved.pm
@@ -61,7 +61,7 @@
use base qw(VCL::Module::State);
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/managementnode/lib/VCL/utils.pm b/managementnode/lib/VCL/utils.pm
index 75cf782..5f7b6ae 100644
--- a/managementnode/lib/VCL/utils.pm
+++ b/managementnode/lib/VCL/utils.pm
@@ -43,7 +43,7 @@
use base qw();
# Specify the version of this module
-our $VERSION = '2.5';
+our $VERSION = '2.5.1';
# Specify the version of Perl to use
use 5.008000;
diff --git a/mysql/update-vcl.sql b/mysql/update-vcl.sql
index 60ddc8f..da77a52 100644
--- a/mysql/update-vcl.sql
+++ b/mysql/update-vcl.sql
@@ -872,10 +872,10 @@
CREATE TABLE IF NOT EXISTS `addomain` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`ownerid` mediumint(8) unsigned NOT NULL,
- `name` varchar(30) NOT NULL default '',
+ `name` varchar(512) NOT NULL default '',
`domainDNSName` varchar(70) NOT NULL default '',
`dnsServers` varchar(512) default NULL,
- `username` varchar(64) NOT NULL default '',
+ `username` varchar(80) NOT NULL default '',
`password` varchar(256) NOT NULL default '',
`secretid` smallint(5) unsigned NOT NULL,
`usedbhostnames` tinyint(1) unsigned NOT NULL default '0',
@@ -886,6 +886,10 @@
CALL DropExistingIndices('addomain', 'domainDNSName');
CALL AddIndexIfNotExists('addomain', 'domainDNSName');
+CALL AddColumnIfNotExists('addomain', 'usedbhostnames', "tinyint(1) unsigned NOT NULL default '0'");
+
+ALTER TABLE `addomain` CHANGE `name` `name` varchar(512) NOT NULL default '';
+ALTER TABLE `addomain` CHANGE `username` `username` varchar(80) NOT NULL default '';
-- --------------------------------------------------------
@@ -1024,6 +1028,7 @@
ALTER TABLE `image` CHANGE `basedoffrevisionid` `basedoffrevisionid` mediumint(8) unsigned default NULL;
CALL AddIndexIfNotExists('image', 'basedoffrevisionid');
+ALTER TABLE `image` CHANGE `maxinitialtime` `maxinitialtime` mediumint(8) unsigned NOT NULL default '0';
-- --------------------------------------------------------
@@ -1323,6 +1328,14 @@
-- --------------------------------------------------------
--
+-- Table structure for table `resourcegroup`
+--
+
+ALTER TABLE `resourcegroup` CHANGE `name` `name` varchar(60) NOT NULL default '';
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `resourcepriv`
--
CALL AddManageMapping();
diff --git a/mysql/vcl.sql b/mysql/vcl.sql
index 45db9ea..197939f 100644
--- a/mysql/vcl.sql
+++ b/mysql/vcl.sql
@@ -32,10 +32,10 @@
CREATE TABLE IF NOT EXISTS `addomain` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`ownerid` mediumint(8) unsigned NOT NULL,
- `name` varchar(30) NOT NULL default '',
+ `name` varchar(512) NOT NULL default '',
`domainDNSName` varchar(70) NOT NULL default '',
`dnsServers` varchar(512) default NULL,
- `username` varchar(64) NOT NULL default '',
+ `username` varchar(80) NOT NULL default '',
`password` varchar(256) NOT NULL default '',
`secretid` smallint(5) unsigned NOT NULL,
`usedbhostnames` tinyint(1) unsigned NOT NULL default '0',
@@ -53,9 +53,9 @@
CREATE TABLE IF NOT EXISTS `adminlevel` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(10) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -72,7 +72,7 @@
`helpaddress` varchar(32) default NULL,
`shibonly` tinyint(1) unsigned NOT NULL default '0',
`theme` varchar(50) default NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -87,7 +87,7 @@
`computerid` smallint(5) unsigned NOT NULL default '0',
`imageid` smallint(5) unsigned NOT NULL default '0',
`reloadrequestid` mediumint(8) unsigned NOT NULL default '0',
- PRIMARY KEY (`blockTimeid`,`computerid`),
+ PRIMARY KEY (`blockTimeid`,`computerid`),
KEY `computerid` (`computerid`),
KEY `imageid` (`imageid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -109,13 +109,13 @@
`managementnodeid` smallint(5) unsigned default NULL,
`expireTime` datetime NOT NULL,
`processing` tinyint(1) unsigned NOT NULL,
- `status` enum('requested','accepted','completed','rejected','deleted') NOT NULL DEFAULT 'accepted',
+ `status` enum('requested','accepted','completed','rejected','deleted') NOT NULL default 'accepted',
`comments` text,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `imageid` (`imageid`),
KEY `groupid` (`groupid`),
KEY `ownerid` (`ownerid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -130,11 +130,11 @@
`end` datetime NOT NULL,
`processed` tinyint(1) unsigned NOT NULL default '0',
`skip` tinyint(1) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `start` (`start`),
KEY `end` (`end`),
KEY `blockRequestid` (`blockRequestid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -178,7 +178,7 @@
CREATE TABLE IF NOT EXISTS `changelog` (
`id` int(10) unsigned NOT NULL auto_increment,
`logid` int(10) unsigned NOT NULL default '0',
- `userid` mediumint(8) unsigned DEFAULT NULL,
+ `userid` mediumint(8) unsigned default NULL,
`reservationid` mediumint(8) unsigned default NULL,
`start` datetime default NULL,
`end` datetime default NULL,
@@ -187,13 +187,13 @@
`wasavailable` tinyint(1) unsigned default NULL,
`timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
`other` varchar(255) default NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `logid` (`logid`),
KEY `userid` (`userid`),
KEY `reservationid` (`reservationid`),
KEY `computerid` (`computerid`),
- UNIQUE KEY reservation_user_remoteIP (userid,reservationid,remoteIP)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ UNIQUE KEY `reservation_user_remoteIP` (`userid`,`reservationid`,`remoteIP`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -241,7 +241,7 @@
`provisioningid` smallint(5) unsigned NOT NULL,
`drivetype` varchar(4) NOT NULL default 'hda',
`deleted` tinyint(1) unsigned NOT NULL default '0',
- `datedeleted` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `datedeleted` datetime NOT NULL default '0000-00-00 00:00:00',
`notes` text,
`lastcheck` datetime default NULL,
`location` varchar(255) default NULL,
@@ -253,10 +253,10 @@
`hostpub` mediumtext,
`vmtypeid` tinyint(3) unsigned default NULL,
`predictivemoduleid` smallint(5) unsigned NOT NULL default '9',
- PRIMARY KEY (`id`),
- UNIQUE KEY `hostname` (`hostname`, `datedeleted`),
- UNIQUE KEY `eth1macaddress` (`eth1macaddress`, `datedeleted`),
- UNIQUE KEY `eth0macaddress` (`eth0macaddress`, `datedeleted`),
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `hostname` (`hostname`,`datedeleted`),
+ UNIQUE KEY `eth1macaddress` (`eth1macaddress`,`datedeleted`),
+ UNIQUE KEY `eth0macaddress` (`eth0macaddress`,`datedeleted`),
KEY `ownerid` (`ownerid`),
KEY `stateid` (`stateid`),
KEY `platformid` (`platformid`),
@@ -270,7 +270,7 @@
KEY `nextimageid` (`nextimageid`),
KEY `provisioningid` (`provisioningid`),
KEY `imagerevisionid` (`imagerevisionid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -294,17 +294,17 @@
--
CREATE TABLE IF NOT EXISTS `computerloadlog` (
- `id` int(12) unsigned NOT NULL auto_increment,
+ `id` int(10) unsigned NOT NULL auto_increment,
`reservationid` mediumint(8) unsigned NOT NULL,
`computerid` smallint(8) unsigned NOT NULL,
`loadstateid` smallint(8) unsigned NOT NULL,
`timestamp` datetime default NULL,
`additionalinfo` text,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `reservationid` (`reservationid`),
KEY `loadstateid` (`loadstateid`),
KEY `computerid` (`computerid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -317,9 +317,9 @@
`loadstatename` varchar(24) NOT NULL,
`prettyname` varchar(50) default NULL,
`est` tinyint(2) unsigned default NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `loadstatename` (`loadstatename`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -327,20 +327,20 @@
-- Table structure for table 'connectlog'
--
-CREATE TABLE IF NOT EXISTS connectlog (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+CREATE TABLE IF NOT EXISTS `connectlog` (
+ `id` int(10) unsigned NOT NULL auto_increment,
`logid` int(10) unsigned NOT NULL,
`reservationid` mediumint(8) unsigned NOT NULL,
- `userid` mediumint(8) unsigned DEFAULT NULL,
+ `userid` mediumint(8) unsigned default NULL,
`remoteIP` varchar(39) NOT NULL,
`verified` tinyint(1) NOT NULL,
- `timestamp` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (id),
- UNIQUE KEY reservationid_1 (reservationid,userid,remoteIP),
- KEY reservationid (reservationid),
- KEY userid (userid),
- KEY logid (logid)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `reservationid_1` (`reservationid`,`userid`,`remoteIP`),
+ KEY `reservationid` (`reservationid`),
+ KEY `userid` (`userid`),
+ KEY `logid` (`logid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -354,10 +354,10 @@
`description` varchar(255) NOT NULL,
`connecttext` text NOT NULL,
`servicename` varchar(32) NOT NULL,
- `startupscript` varchar(256) DEFAULT NULL,
+ `startupscript` varchar(256) default NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`,`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -389,10 +389,10 @@
`connectmethodid` tinyint(3) unsigned NOT NULL,
`port` mediumint(8) unsigned NOT NULL,
`protocol` enum('TCP','UDP') NOT NULL default 'TCP',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `connectmethodid_port_protocol` (`connectmethodid`,`port`,`protocol`),
KEY `connectmethodid` (`connectmethodid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -410,7 +410,7 @@
`multicall` tinyint(1) unsigned NOT NULL default '1',
`parentid` varchar(255) default NULL,
`deletefromid` varchar(255) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `parentid` (`parentid`),
KEY `userid` (`userid`),
KEY `expiretime` (`expiretime`),
@@ -424,9 +424,9 @@
--
CREATE TABLE IF NOT EXISTS `cryptkey` (
- `id` smallint(6) unsigned NOT NULL AUTO_INCREMENT,
+ `id` smallint(6) unsigned NOT NULL auto_increment,
`hostid` smallint(6) unsigned NOT NULL,
- `hosttype` enum('managementnode','web') NOT NULL DEFAULT 'managementnode',
+ `hosttype` enum('managementnode','web') NOT NULL default 'managementnode',
`pubkey` varchar(1000) NOT NULL,
`algorithm` varchar(80) NOT NULL,
`algorithmoption` varchar(255) NOT NULL,
@@ -442,7 +442,7 @@
--
CREATE TABLE IF NOT EXISTS `cryptsecret` (
- `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+ `id` mediumint(8) unsigned NOT NULL auto_increment,
`cryptkeyid` smallint(5) unsigned NOT NULL,
`secretid` smallint(5) unsigned NOT NULL,
`cryptsecret` varchar(1000) NOT NULL,
@@ -492,14 +492,14 @@
`test` tinyint(1) unsigned NOT NULL default '0',
`lastupdate` datetime default NULL,
`forcheckout` tinyint(1) unsigned NOT NULL default '1',
- `maxinitialtime` smallint(5) unsigned NOT NULL default '0',
+ `maxinitialtime` mediumint(8) unsigned NOT NULL default '0',
`project` enum('vcl','hpc','vclhpc') NOT NULL default 'vcl',
`size` smallint(5) unsigned NOT NULL default '0',
`architecture` enum('x86','x86_64') NOT NULL default 'x86',
`description` text,
`usage` text,
`basedoffrevisionid` mediumint(8) unsigned default NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`),
UNIQUE KEY `prettyname` (`prettyname`),
KEY `ownerid` (`ownerid`),
@@ -508,7 +508,7 @@
KEY `imagemetaid` (`imagemetaid`),
KEY `imagetypeid` (`imagetypeid`),
KEY `basedoffrevisionid` (`basedoffrevisionid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -538,8 +538,8 @@
`architecture` varchar(10) default NULL,
`rootaccess` tinyint(1) unsigned NOT NULL default '1',
`sethostname` tinyint(1) unsigned default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -558,12 +558,12 @@
`production` tinyint(1) unsigned NOT NULL,
`comments` text,
`imagename` varchar(75) NOT NULL,
- `autocaptured` tinyint(1) unsigned NOT NULL DEFAULT '0',
- PRIMARY KEY (`id`),
+ `autocaptured` tinyint(1) unsigned NOT NULL default '0',
+ PRIMARY KEY (`id`),
UNIQUE KEY `production` (`production`,`imagename`),
UNIQUE KEY `imageid` (`imageid`,`revision`),
KEY `userid` (`userid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -573,7 +573,7 @@
CREATE TABLE IF NOT EXISTS `imagerevisioninfo` (
`imagerevisionid` mediumint(8) unsigned NOT NULL,
- `usernames` varchar(512) DEFAULT NULL,
+ `usernames` varchar(512) default NULL,
`firewallenabled` varchar(20) NOT NULL,
`timestamp` datetime NOT NULL,
UNIQUE KEY `imagerevisionid` (`imagerevisionid`)
@@ -588,9 +588,9 @@
CREATE TABLE IF NOT EXISTS `imagetype` (
`id` smallint(5) unsigned NOT NULL auto_increment,
`name` varchar(16) NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -601,9 +601,9 @@
CREATE TABLE IF NOT EXISTS `IMtype` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(20) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -617,7 +617,7 @@
`salt` varchar(8) NOT NULL default '',
`lastupdated` datetime NOT NULL default '0000-00-00 00:00:00',
`lockedout` tinyint(1) unsigned NOT NULL default '0',
- PRIMARY KEY (`userid`)
+ PRIMARY KEY (`userid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -641,14 +641,14 @@
`remoteIP` varchar(15) default NULL,
`imageid` smallint(5) unsigned NOT NULL default '0',
`size` smallint(5) unsigned NOT NULL default '1450',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `userid` (`userid`),
KEY `computerid` (`computerid`),
KEY `imageid` (`imageid`),
KEY `finalend` (`finalend`),
KEY `start` (`start`),
KEY `wasavailable` (`wasavailable`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -663,7 +663,7 @@
`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
`passfail` tinyint(1) unsigned NOT NULL default '0',
`remoteIP` varchar(15) NOT NULL,
- `code` enum('none','invalid credentials') NOT NULL DEFAULT 'none',
+ `code` enum('none','invalid credentials') NOT NULL default 'none',
KEY `user` (`user`),
KEY `affiliationid` (`affiliationid`),
KEY `timestamp` (`timestamp`),
@@ -700,13 +700,13 @@
`sharedMailBox` varchar(128) default NULL,
`NOT_STANDALONE` varchar(128) default NULL,
`availablenetworks` text NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `hostname` (`hostname`),
KEY `stateid` (`stateid`),
KEY `ownerid` (`ownerid`),
KEY `imagelibgroupid` (`imagelibgroupid`),
KEY `IPaddress` (`IPaddress`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -718,7 +718,7 @@
`name` varchar(128) NOT NULL,
`value` longtext NOT NULL,
PRIMARY KEY (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -732,9 +732,9 @@
`prettyname` varchar(70) NOT NULL,
`description` varchar(255) NOT NULL,
`perlpackage` varchar(150) NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -746,10 +746,10 @@
`id` smallint(5) unsigned NOT NULL auto_increment,
`resourceid` mediumint(8) unsigned NOT NULL,
`publicIPaddress` varchar(15) NOT NULL,
- `internalIPaddress` varchar(15) DEFAULT NULL,
- PRIMARY KEY (`id`),
+ `internalIPaddress` varchar(15) default NULL,
+ PRIMARY KEY (`id`),
UNIQUE KEY `resourceid` (`resourceid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -762,9 +762,9 @@
`nathostresourceid` mediumint(8) unsigned NOT NULL,
`publicIPaddress` varchar(15) NOT NULL,
`publicport` smallint(5) unsigned NOT NULL,
- `internalIPaddress` varchar(15) DEFAULT NULL,
+ `internalIPaddress` varchar(15) default NULL,
`internalport` smallint(5) unsigned NOT NULL,
- `protocol` enum('TCP','UDP') NOT NULL DEFAULT 'TCP',
+ `protocol` enum('TCP','UDP') NOT NULL default 'TCP',
`timestamp` datetime NOT NULL,
UNIQUE KEY `sublogid` (`sublogid`,`nathostresourceid`,`publicIPaddress`,`publicport`,`internalIPaddress`,`internalport`,`protocol`),
KEY `logid` (`sublogid`),
@@ -809,13 +809,13 @@
--
CREATE TABLE IF NOT EXISTS `oneclick` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `id` int(10) unsigned NOT NULL auto_increment,
`userid` mediumint(8) unsigned NOT NULL,
`imageid` smallint(5) unsigned NOT NULL,
`name` varchar(70) NOT NULL,
`duration` int(11) NOT NULL,
- `autologin` tinyint(1) NOT NULL DEFAULT '0',
- `status` tinyint(4) NOT NULL DEFAULT '1',
+ `autologin` tinyint(1) NOT NULL default '0',
+ `status` tinyint(4) NOT NULL default '1',
PRIMARY KEY (`id`),
KEY `userid` (`userid`),
KEY `imageid` (`imageid`)
@@ -829,7 +829,7 @@
CREATE TABLE IF NOT EXISTS `openstackcomputermap` (
`instanceid` varchar(50) NOT NULL,
- `computerid` smallint(5) unsigned DEFAULT NULL,
+ `computerid` smallint(5) unsigned default NULL,
PRIMARY KEY (`instanceid`),
UNIQUE KEY `computerid` (`computerid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -859,16 +859,16 @@
`prettyname` varchar(64) NOT NULL default '',
`type` varchar(30) NOT NULL,
`installtype` varchar(30) NOT NULL default 'image',
- `minram` mediumint(8) unsigned NOT NULL DEFAULT '512',
+ `minram` mediumint(8) unsigned NOT NULL default '512',
`sourcepath` varchar(30) default NULL,
`moduleid` smallint(5) unsigned default NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`),
UNIQUE KEY `prettyname` (`prettyname`),
KEY `type` (`type`),
KEY `installtype` (`installtype`),
KEY `moduleid` (`moduleid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -879,9 +879,9 @@
CREATE TABLE IF NOT EXISTS `OSinstalltype` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(30) NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -892,9 +892,9 @@
CREATE TABLE IF NOT EXISTS `OStype` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(30) NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -905,9 +905,9 @@
CREATE TABLE IF NOT EXISTS `platform` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(20) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -919,9 +919,9 @@
`id` mediumint(8) unsigned NOT NULL auto_increment,
`parent` mediumint(8) unsigned NOT NULL default '0',
`name` varchar(50) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `parent` (`parent`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='nodes for privilege tree';
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='nodes for privilege tree';
-- --------------------------------------------------------
@@ -934,10 +934,10 @@
`name` varchar(30) NOT NULL,
`prettyname` varchar(70) NOT NULL,
`moduleid` smallint(5) unsigned NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `moduleid` (`moduleid`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -948,9 +948,9 @@
CREATE TABLE IF NOT EXISTS `provisioningOSinstalltype` (
`provisioningid` smallint(5) unsigned NOT NULL,
`OSinstalltypeid` tinyint(3) unsigned NOT NULL,
- PRIMARY KEY (`provisioningid`,`OSinstalltypeid`),
+ PRIMARY KEY (`provisioningid`,`OSinstalltypeid`),
KEY `OSinstalltypeid` (`OSinstalltypeid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -986,14 +986,14 @@
`daterequested` datetime NOT NULL default '0000-00-00 00:00:00',
`datemodified` datetime default NULL,
`checkuser` tinyint(1) unsigned NOT NULL default '1',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `userid` (`userid`),
KEY `stateid` (`stateid`),
KEY `laststateid` (`laststateid`),
KEY `logid` (`logid`),
KEY `start` (`start`),
KEY `end` (`end`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1013,13 +1013,13 @@
`pw` varchar(40) default NULL,
`connectIP` varchar(15) default NULL,
`connectport` smallint(5) unsigned default NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `managementnodeid` (`managementnodeid`),
KEY `imageid` (`imageid`),
KEY `requestid` (`requestid`),
KEY `computerid` (`computerid`),
KEY `imagerevisionid` (`imagerevisionid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1045,9 +1045,9 @@
`id` mediumint(8) unsigned NOT NULL auto_increment,
`resourcetypeid` tinyint(5) unsigned NOT NULL default '0',
`subid` mediumint(8) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `resourcetypeid` (`resourcetypeid`,`subid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1057,13 +1057,13 @@
CREATE TABLE IF NOT EXISTS `resourcegroup` (
`id` smallint(5) unsigned NOT NULL auto_increment,
- `name` varchar(50) NOT NULL default '',
+ `name` varchar(60) NOT NULL default '',
`ownerusergroupid` smallint(5) unsigned NOT NULL default '39',
`resourcetypeid` tinyint(3) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `resourcetypeid` (`resourcetypeid`,`name`),
KEY `ownerusergroupid` (`ownerusergroupid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1074,7 +1074,7 @@
CREATE TABLE IF NOT EXISTS `resourcegroupmembers` (
`resourceid` mediumint(8) unsigned NOT NULL default '0',
`resourcegroupid` smallint(5) unsigned NOT NULL default '0',
- PRIMARY KEY (`resourceid`,`resourcegroupid`),
+ PRIMARY KEY (`resourceid`,`resourcegroupid`),
KEY `resourcegroupid` (`resourcegroupid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -1089,7 +1089,7 @@
`resourcetypeid1` tinyint(3) unsigned NOT NULL default '13',
`resourcegroupid2` smallint(5) unsigned NOT NULL default '0',
`resourcetypeid2` tinyint(3) unsigned NOT NULL default '12',
- PRIMARY KEY (`resourcegroupid1`,`resourcegroupid2`),
+ PRIMARY KEY (`resourcegroupid1`,`resourcegroupid2`),
KEY `resourcetypeid1` (`resourcetypeid1`),
KEY `resourcetypeid2` (`resourcetypeid2`),
KEY `resourcegroupid2` (`resourcegroupid2`)
@@ -1106,10 +1106,10 @@
`resourcegroupid` smallint(5) unsigned NOT NULL default '0',
`privnodeid` mediumint(8) unsigned NOT NULL default '0',
`type` enum('block','cascade','available','administer','manageGroup','manageMapping') NOT NULL default 'block',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `resourcegroupid` (`resourcegroupid`,`privnodeid`,`type`),
KEY `privnodeid` (`privnodeid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1120,9 +1120,9 @@
CREATE TABLE IF NOT EXISTS `resourcetype` (
`id` tinyint(5) unsigned NOT NULL auto_increment,
`name` varchar(50) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1134,10 +1134,10 @@
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(25) NOT NULL default '',
`ownerid` mediumint(8) unsigned NOT NULL default '1',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`),
KEY `ownerid` (`ownerid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1163,7 +1163,7 @@
`imageid` smallint(5) unsigned NOT NULL,
`imagerevisionid` mediumint(8) unsigned NOT NULL,
`managementnodeid` smallint(5) unsigned NOT NULL,
- `expires` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+ `expires` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`procid` varchar(255) NOT NULL,
KEY `computerid` (`computerid`),
KEY `imageid` (`imageid`),
@@ -1191,13 +1191,13 @@
`admingroupid` smallint(5) unsigned default NULL,
`logingroupid` smallint(5) unsigned default NULL,
`monitored` tinyint(1) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `ownerid` (`ownerid`),
UNIQUE KEY `name` (`name`),
KEY `admingroupid` (`admingroupid`),
KEY `logingroupid` (`logingroupid`),
KEY `imageid` (`imageid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1215,12 +1215,12 @@
`admingroupid` smallint(5) unsigned default NULL,
`logingroupid` smallint(5) unsigned default NULL,
`monitored` tinyint(1) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `requestid` (`requestid`),
KEY `admingroupid` (`admingroupid`),
KEY `logingroupid` (`logingroupid`),
KEY `serverprofileid` (`serverprofileid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1234,8 +1234,8 @@
`ts` datetime NOT NULL,
`sessid` varchar(80) NOT NULL,
`data` text NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1253,11 +1253,11 @@
`usermessage` text NOT NULL,
`informhoursahead` smallint(5) unsigned NOT NULL,
`allowreservations` tinyint(1) unsigned NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
KEY `start` (`start`),
KEY `end` (`end`),
KEY `ownerid` (`ownerid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1268,9 +1268,9 @@
CREATE TABLE IF NOT EXISTS `state` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(20) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1310,7 +1310,7 @@
--
CREATE TABLE IF NOT EXISTS `sublog` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `id` int(10) unsigned NOT NULL auto_increment,
`logid` int(10) unsigned NOT NULL default '0',
`imageid` smallint(5) unsigned NOT NULL default '0',
`imagerevisionid` mediumint(8) unsigned NOT NULL,
@@ -1365,12 +1365,12 @@
`validated` tinyint(1) unsigned NOT NULL default '1',
`usepublickeys` tinyint(1) unsigned NOT NULL default '0',
`sshpublickeys` text,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `unityid` (`unityid`,`affiliationid`),
UNIQUE KEY `uid` (`uid`),
KEY `IMtypeid` (`IMtypeid`),
KEY `affiliationid` (`affiliationid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1390,12 +1390,12 @@
`totalmaxtime` mediumint(8) unsigned NOT NULL default '360',
`maxextendtime` mediumint(8) unsigned NOT NULL default '60',
`overlapResCount` smallint(5) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`,`affiliationid`),
KEY `ownerid` (`ownerid`),
KEY `editusergroupid` (`editusergroupid`),
KEY `affiliationid` (`affiliationid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1406,7 +1406,7 @@
CREATE TABLE IF NOT EXISTS `usergroupmembers` (
`userid` mediumint(8) unsigned NOT NULL default '0',
`usergroupid` smallint(5) unsigned NOT NULL default '0',
- PRIMARY KEY (`userid`,`usergroupid`),
+ PRIMARY KEY (`userid`,`usergroupid`),
KEY `usergroupid` (`usergroupid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -1448,12 +1448,12 @@
`usergroupid` smallint(5) unsigned default NULL,
`privnodeid` mediumint(8) unsigned NOT NULL default '0',
`userprivtypeid` smallint(5) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`,`privnodeid`,`userprivtypeid`),
+ PRIMARY KEY (`id`,`privnodeid`,`userprivtypeid`),
UNIQUE KEY `userid` (`userid`,`privnodeid`,`userprivtypeid`),
UNIQUE KEY `usergroupid` (`usergroupid`,`privnodeid`,`userprivtypeid`),
KEY `privnodeid` (`privnodeid`),
KEY `userprivtypeid` (`userprivtypeid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1464,9 +1464,9 @@
CREATE TABLE IF NOT EXISTS `userprivtype` (
`id` smallint(5) unsigned NOT NULL auto_increment,
`name` varchar(50) NOT NULL default '',
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1481,7 +1481,7 @@
`value` longtext NOT NULL,
`setby` varchar(128) default NULL,
`timestamp` datetime NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -1510,10 +1510,10 @@
`id` smallint(5) unsigned NOT NULL auto_increment,
`computerid` smallint(5) unsigned NOT NULL,
`vmprofileid` smallint(5) unsigned NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `computerid_vmprofileid` (`computerid`,`vmprofileid`),
KEY `vmprofileid` (`vmprofileid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1534,24 +1534,24 @@
`vmpath` varchar(128) default NULL,
`virtualswitch0` varchar(80) NOT NULL default 'VMnet0',
`virtualswitch1` varchar(80) NOT NULL default 'VMnet2',
- `virtualswitch2` varchar(80) NULL default NULL,
- `virtualswitch3` varchar(80) NULL default NULL,
+ `virtualswitch2` varchar(80) default NULL,
+ `virtualswitch3` varchar(80) default NULL,
`vmdisk` enum('dedicated','shared') NOT NULL default 'dedicated',
- `username` varchar(80) NULL default NULL,
- `password` varchar(256) NULL default NULL,
- `secretid` smallint(5) unsigned NULL default NULL,
+ `username` varchar(80) default NULL,
+ `password` varchar(256) default NULL,
+ `secretid` smallint(5) unsigned default NULL,
`eth0generated` tinyint(1) unsigned NOT NULL default '0',
`eth1generated` tinyint(1) unsigned NOT NULL default '0',
- `rsapub` text NULL default NULL,
- `rsakey` varchar(256) NULL default NULL,
- `encryptedpasswd` text NULL default NULL,
- PRIMARY KEY (`id`),
+ `rsapub` text default NULL,
+ `rsakey` varchar(256) default NULL,
+ `encryptedpasswd` text default NULL,
+ PRIMARY KEY (`id`),
UNIQUE KEY `profilename` (`profilename`),
KEY `imageid` (`imageid`),
KEY `repositoryimagetypeid` (`repositoryimagetypeid`),
KEY `datastoreimagetypeid` (`datastoreimagetypeid`),
KEY `secretid` (`secretid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
@@ -1562,9 +1562,9 @@
CREATE TABLE IF NOT EXISTS `vmtype` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(30) NOT NULL,
- PRIMARY KEY (`id`),
+ PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-- --------------------------------------------------------
diff --git a/vcl-install.sh b/vcl-install.sh
index c67e003..89bd375 100755
--- a/vcl-install.sh
+++ b/vcl-install.sh
@@ -69,7 +69,7 @@
eval set -- "$args"
# ------------------------- variables -------------------------------
-VCL_VERSION=2.5
+VCL_VERSION=2.5.1
DB_USERNAME=vcluser
ADMIN_PASSWORD=
@@ -178,8 +178,8 @@
fi
VCL_VERSION=${VCL_VERSION}-RC$RC
ARCHIVE=apache-VCL-$VCL_VERSION.tar.bz2
- ARCHIVEURLPATH="http://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
- SIGPATH="http://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
+ ARCHIVEURLPATH="https://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
+ SIGPATH="https://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
fi
if [[ $DOALL -eq 1 ]]; then
@@ -433,7 +433,7 @@
salt=$(random_string 8)
#echo "Password salt: $salt"
- passhash=$(echo -n $password$salt | sha1sum | awk '{print $1}')
+ passhash=$(echo -n $password$salt | sha512sum | awk '{print $1}')
#echo "Password hash: $passhash"
mysql -e "UPDATE localauth SET passhash = '$passhash', salt = '$salt', lastupdated = NOW() WHERE localauth.userid = (SELECT id FROM user WHERE unityid = '$username');" vcl
if [ $? -ne 0 ]; then
@@ -450,12 +450,12 @@
if [ $? -ne 0 ]; then generic_error "failed to download $ARCHIVE from $ARCHIVEURLPATH"; exit 1; fi
}
-function validate_archive_sha1() {
- echo "Downloading sha1 file for $VCL_VERSION..."
- /bin/rm -f $ARCHIVE.sha1
- wget -q $SIGPATH$ARCHIVE.sha1
+function validate_archive_sha512() {
+ echo "Downloading sha512 file for $VCL_VERSION..."
+ /bin/rm -f $ARCHIVE.sha512
+ wget -q $SIGPATH$ARCHIVE.sha512
echo "validating $ARCHIVE"
- sha1sum -c $ARCHIVE.sha1
+ sha512sum -c $ARCHIVE.sha512
return $?
}
@@ -487,19 +487,19 @@
if [[ ! -f $ARCHIVE ]]; then
echo "Downloading VCL $VCL_VERSION..."
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
else
dir=`pwd`
echo "archive for $VCL_VERSION found at $dir/$ARCHIVE"
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then
echo "failed to validate $ARCHIVE; downloading again..."
/bin/mv -f $ARCHIVE $ARCHIVE.old
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
diff --git a/vcl-upgrade.sh b/vcl-upgrade.sh
index e0ed9db..a287323 100755
--- a/vcl-upgrade.sh
+++ b/vcl-upgrade.sh
@@ -62,7 +62,7 @@
eval set -- "$args"
# ------------------------- variables -------------------------------
-VCL_VERSION=2.5
+VCL_VERSION=2.5.1
OLD_VERSION=""
DB_NAME=vcl
WEB_PATH=/var/www/html/vcl
@@ -73,7 +73,7 @@
DB_HOST=localhost
ARCHIVE=apache-VCL-$VCL_VERSION.tar.bz2
ARCHIVEURLPATH="http://vcl.apache.org/downloads/download.cgi?action=download&filename=%2Fvcl%2F$VCL_VERSION%2F"
-SIGPATH="http://www.apache.org/dist/vcl/$VCL_VERSION/"
+SIGPATH="https://www.apache.org/dist/vcl/$VCL_VERSION/"
DODB=0
DOWEB=0
@@ -151,8 +151,8 @@
fi
VCL_VERSION=${VCL_VERSION}-RC$RC
ARCHIVE=apache-VCL-$VCL_VERSION.tar.bz2
- ARCHIVEURLPATH="http://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
- SIGPATH="http://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
+ ARCHIVEURLPATH="https://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
+ SIGPATH="https://people.apache.org/~jfthomps/apache-VCL-${VCL_VERSION}/"
fi
if [[ $DOALL -eq 1 ]]; then
@@ -300,12 +300,12 @@
if [ $? -ne 0 ]; then generic_error "failed to download $ARCHIVE from $ARCHIVEURLPATH"; exit 1; fi
}
-function validate_archive_sha1() {
- echo "Downloading sha1 file for $VCL_VERSION..."
- /bin/rm -f $ARCHIVE.sha1
- wget -q $SIGPATH$ARCHIVE.sha1
+function validate_archive_sha512() {
+ echo "Downloading sha512 file for $VCL_VERSION..."
+ /bin/rm -f $ARCHIVE.sha512
+ wget -q $SIGPATH$ARCHIVE.sha512
echo "validating $ARCHIVE"
- sha1sum -c $ARCHIVE.sha1
+ sha512sum -c $ARCHIVE.sha512
return $?
}
@@ -586,19 +586,19 @@
if [[ ! -f $ARCHIVE ]]; then
echo "Downloading VCL $VCL_VERSION..."
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
else
dir=`pwd`
echo "archive for $VCL_VERSION found at $dir/$ARCHIVE"
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then
echo "failed to validate $ARCHIVE; downloading again..."
/bin/mv -f $ARCHIVE $ARCHIVE.old
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
diff --git a/web/index.php b/web/index.php
index 0d059c9..0f6a6cd 100644
--- a/web/index.php
+++ b/web/index.php
@@ -16,8 +16,8 @@
limitations under the License.
*/
-# ASF VCL v2.5
-$VCLversion = '2.5';
+# ASF VCL v2.5.1
+$VCLversion = '2.5.1';
require_once(".ht-inc/conf.php");
diff --git a/web/js/nls/es_CR/messages.js b/web/js/nls/es_CR/messages.js
index 1ea2d26..1fdc787 100644
--- a/web/js/nls/es_CR/messages.js
+++ b/web/js/nls/es_CR/messages.js
@@ -146,5 +146,10 @@
'Invalid item submitted to save':'Elemento inválido para guardar',
'Message successfully saved':'Mensaje guardado satisfactoriamente',
'No changes to submitted message. Nothing saved.':'Sin cambios en el mensaje. Nada guardado.',
-'unset':'sin especificar'
+'unset':'sin especificar',
+'1 hour':'',
+'Default for User':'',
+'Invalid Max Reservation Duration selected':'',
+'minutes':'',
+'Passwords do not match':''
}
diff --git a/web/js/nls/es_MX/messages.js b/web/js/nls/es_MX/messages.js
index 990c81a..bfe4500 100644
--- a/web/js/nls/es_MX/messages.js
+++ b/web/js/nls/es_MX/messages.js
@@ -146,5 +146,10 @@
'Invalid item submitted to save':'',
'Message successfully saved':'',
'No changes to submitted message. Nothing saved.':'',
-'unset':''
+'unset':'',
+'1 hour':'',
+'Default for User':'',
+'Invalid Max Reservation Duration selected':'',
+'minutes':'',
+'Passwords do not match':''
}
diff --git a/web/js/nls/fr_CA/messages.js b/web/js/nls/fr_CA/messages.js
index fb82d8b..0e230ac 100644
--- a/web/js/nls/fr_CA/messages.js
+++ b/web/js/nls/fr_CA/messages.js
@@ -146,5 +146,10 @@
'Invalid item submitted to save':'',
'Message successfully saved':'',
'No changes to submitted message. Nothing saved.':'',
-'unset':''
+'unset':'',
+'1 hour':'',
+'Default for User':'',
+'Invalid Max Reservation Duration selected':'',
+'minutes':'',
+'Passwords do not match':''
}
diff --git a/web/js/nls/messages.js.template b/web/js/nls/messages.js.template
index 2f6abba..60cee37 100644
--- a/web/js/nls/messages.js.template
+++ b/web/js/nls/messages.js.template
@@ -146,5 +146,10 @@
'Invalid item submitted to save':'',
'Message successfully saved':'',
'No changes to submitted message. Nothing saved.':'',
-'unset':''
+'unset':'',
+'1 hour':'',
+'Default for User':'',
+'Invalid Max Reservation Duration selected':'',
+'minutes':'',
+'Passwords do not match':''
}
diff --git a/web/js/nls/pt_PT/messages.js b/web/js/nls/pt_PT/messages.js
index 6e9beaa..62c3c88 100644
--- a/web/js/nls/pt_PT/messages.js
+++ b/web/js/nls/pt_PT/messages.js
@@ -146,5 +146,10 @@
'Invalid item submitted to save':'',
'Message successfully saved':'',
'No changes to submitted message. Nothing saved.':'',
-'unset':''
+'unset':'',
+'1 hour':'',
+'Default for User':'',
+'Invalid Max Reservation Duration selected':'',
+'minutes':'',
+'Passwords do not match':''
}
diff --git a/web/locale/es_CR/LC_MESSAGES/vcl.mo b/web/locale/es_CR/LC_MESSAGES/vcl.mo
index 6e0939d..ad75cab 100644
--- a/web/locale/es_CR/LC_MESSAGES/vcl.mo
+++ b/web/locale/es_CR/LC_MESSAGES/vcl.mo
Binary files differ
diff --git a/web/locale/es_MX/LC_MESSAGES/vcl.mo b/web/locale/es_MX/LC_MESSAGES/vcl.mo
index 6675116..eb80d0c 100644
--- a/web/locale/es_MX/LC_MESSAGES/vcl.mo
+++ b/web/locale/es_MX/LC_MESSAGES/vcl.mo
Binary files differ
diff --git a/web/locale/fr_CA/LC_MESSAGES/vcl.mo b/web/locale/fr_CA/LC_MESSAGES/vcl.mo
index a635d1f..d67a77d 100644
--- a/web/locale/fr_CA/LC_MESSAGES/vcl.mo
+++ b/web/locale/fr_CA/LC_MESSAGES/vcl.mo
Binary files differ
diff --git a/web/locale/ja_JP/LC_MESSAGES/vcl.mo b/web/locale/ja_JP/LC_MESSAGES/vcl.mo
index 2e180d4..0766682 100644
--- a/web/locale/ja_JP/LC_MESSAGES/vcl.mo
+++ b/web/locale/ja_JP/LC_MESSAGES/vcl.mo
Binary files differ
diff --git a/web/locale/po_files/es_CR/vcl.po b/web/locale/po_files/es_CR/vcl.po
index d524480..b117b2f 100644
--- a/web/locale/po_files/es_CR/vcl.po
+++ b/web/locale/po_files/es_CR/vcl.po
@@ -14,10 +14,10 @@
# limitations under the License.
msgid ""
msgstr ""
-"Project-Id-Version: Apache VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2016-07-14 22:19-0400\n"
-"PO-Revision-Date: 2017-06-07 13:36-0600\n"
+"PO-Revision-Date: 2019-06-13 15:18-0400\n"
"Last-Translator: Luis Zárate <luis.zarate@solvosoft.com>\n"
"Language-Team: \n"
"Language: es_CR\n"
@@ -26,6 +26,93 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
+#: addomain.php:172
+msgid ""
+"Error encountered while trying to create new AD domain. Please contact an "
+"admin for assistance."
+msgstr ""
+
+#: addomain.php:420 addomain.php:538
+msgid ""
+"Domain DNS Name should be in the format domain.tld and can only contain "
+"letters, numbers, dashes(-), periods(.), and underscores(_) (e.g. "
+"myuniversity.edu)"
+msgstr ""
+
+#: addomain.php:421
+msgid "Domain DNS Name"
+msgstr ""
+
+#. username
+#: addomain.php:424 addomain.php:543
+msgid ""
+"Username cannot contain single (') or double (") quotes, less than "
+"(<), or greater than (>) and can be from 2 to 64 characters long"
+msgstr ""
+
+#: addomain.php:425
+msgid "Username"
+msgstr ""
+
+#. password
+#: addomain.php:428 addomain.php:550
+msgid "Password must be at least 4 characters long"
+msgstr ""
+
+#. confirm password
+#: addomain.php:431
+msgid "Confirm Password"
+msgstr ""
+
+#. use database hostname checkbox
+#: addomain.php:433
+msgid "Use Database Hostnames"
+msgstr ""
+
+#: addomain.php:439
+msgid "DNS Server(s)"
+msgstr ""
+
+#: addomain.php:458
+msgid ""
+"Each AD Domain should be a member of an AD Domain resource group. The "
+"following dialog will allow you to add the new AD Domain to a group."
+msgstr ""
+
+#: addomain.php:480
+msgid ""
+"domain name registered in DNS for Active Directory Domain (ex: ad.example."
+"com)"
+msgstr ""
+
+#: addomain.php:481
+msgid "These credentials will be used to register reserved computers with AD."
+msgstr ""
+
+#: addomain.php:482
+msgid ""
+"comma delimited list of IP addresses for DNS servers that handle Domain DNS"
+msgstr ""
+
+#: addomain.php:483
+msgid ""
+"Check this option if you like to have the computer object names within AD to "
+"match VM hostname stored within the VCL database"
+msgstr ""
+
+#: addomain.php:529
+msgid "An AD domain already exists with this name."
+msgstr ""
+
+#: addomain.php:533
+msgid "Submitted owner is not valid"
+msgstr ""
+
+#: addomain.php:561
+msgid ""
+"Invalid IP address specified for DNS Server - must be a valid IPV4 address"
+msgstr ""
+
#: authentication.php:157 utils.php:828
msgid "Welcome to the Virtual Computing Lab"
msgstr "Bienvenido al Laboratorio Virtual de Cómputo"
@@ -1273,6 +1360,10 @@
msgid "Location"
msgstr "Ubicación"
+#: groups.php:286
+msgid "Delete Group"
+msgstr ""
+
#: help.php:216 help.php:248
msgid "Authentication Method"
msgstr "Métodos de autenticación"
@@ -1769,6 +1860,18 @@
"La siguientes revisiones están en uso y no pueden ser borradas en este "
"momento"
+#: image.php:150 image.php:438
+msgid "Max Reservation Duration"
+msgstr ""
+
+#: image.php:1756
+msgid "Invalid Max Reservation Duration selected"
+msgstr ""
+
+#: image.php:1777
+msgid "Base OU cannot be changed for the selected AD Domain"
+msgstr ""
+
#: managementnode.php:295
msgid ""
"Name can only contain letters, numbers, dashes(-), periods(.), and "
@@ -3417,6 +3520,14 @@
"%s está ahora en el proceso de actualización para usar nuevamente "
"revisiones creadas."
+#: requests.php:1069
+msgid "Reservation is in maintenance - Contact admin for help"
+msgstr ""
+
+#: requests.php:1075
+msgid "Reservation is being captured"
+msgstr ""
+
#: resource.php:172
msgid "Edit Grouping & Mapping"
msgstr "Editar agrupación & mapeo"
@@ -3911,6 +4022,192 @@
msgid "No changes to submitted message. Nothing saved."
msgstr "No hay cambios en el mensaje enviado. Nada se guardó"
+#: siteconfig.php:873
+msgid "Failed to update data for these affiliations:"
+msgstr ""
+
+#: siteconfig.php:979
+msgid "Default value"
+msgstr ""
+
+#: siteconfig.php:1064
+msgid "You do not have access to modify the submitted setting."
+msgstr ""
+
+#: siteconfig.php:1090
+msgid "Failed to add submited value"
+msgstr ""
+
+#: siteconfig.php:1228
+#, php-format
+msgid "Failed to delete address for %s"
+msgstr ""
+
+#: siteconfig.php:1272
+msgid "Help Email Address"
+msgstr ""
+
+#: siteconfig.php:1273
+msgid ""
+"This is the email address used as the from address for emails sent by the "
+"VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1278
+#, php-format
+msgid "Help Email Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1279 siteconfig.php:1378 siteconfig.php:1478
+#: siteconfig.php:1681 siteconfig.php:1813 siteconfig.php:1923
+msgid "Update successful"
+msgstr ""
+
+#: siteconfig.php:1280
+#, php-format
+msgid "Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1371
+msgid "Site Web Address"
+msgstr ""
+
+#: siteconfig.php:1372
+msgid "This is the web address in emails sent by the VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1374
+msgid "Invalid web address(es) specified"
+msgstr ""
+
+#: siteconfig.php:1377
+#, php-format
+msgid "Web Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1379
+#, php-format
+msgid "Web Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1470
+msgid "KMS Servers"
+msgstr ""
+
+#: siteconfig.php:1471
+msgid ""
+"These are the KMS servers for activating Windows licensing. Multiple servers "
+"are allowed, delimited with a comma (,). Non standard ports can be specified "
+"after the server delimited with a colon (:). (ex: kms.example.com,kms2."
+"example.com:2000)"
+msgstr ""
+
+#: siteconfig.php:1474
+msgid "Invalid IP or hostname specified"
+msgstr ""
+
+#: siteconfig.php:1477
+#, php-format
+msgid "KMS server added for %s"
+msgstr ""
+
+#: siteconfig.php:1479
+#, php-format
+msgid "KMS server for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1675
+msgid "Site Theme"
+msgstr ""
+
+#: siteconfig.php:1676
+msgid "This controls the theme of the site displayed for each affiliation."
+msgstr ""
+
+#: siteconfig.php:1677
+msgid "Invalid theme specified"
+msgstr ""
+
+#: siteconfig.php:1680
+#, php-format
+msgid "Theme setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1682
+#, php-format
+msgid "Theme setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1807
+msgid "LDAP Lookup for Shibboleth Authenticated Users"
+msgstr ""
+
+#: siteconfig.php:1808
+msgid ""
+"If an affiliation gets configured for Shibboleth authentication, this "
+"specifies that LDAP authentication has also been configured for that "
+"affiliation so that VCL can perform lookups for new users before they log in "
+"to VCL."
+msgstr ""
+
+#: siteconfig.php:1812
+#, php-format
+msgid "LDAP lookup setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1814
+#, php-format
+msgid "LDAP lookup setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1819 siteconfig.php:1928
+msgid "Local"
+msgstr ""
+
+#: siteconfig.php:1917
+msgid "Shibboleth Scope"
+msgstr ""
+
+#: siteconfig.php:1918
+msgid ""
+"This is the Shibboleth scope for an affiliation when Shibboleth "
+"authentication is enabled."
+msgstr ""
+
+#: siteconfig.php:1922
+#, php-format
+msgid "Shibboleth scope added for %s"
+msgstr ""
+
+#: siteconfig.php:1924
+#, php-format
+msgid "Shibboleth scope for %s deleted"
+msgstr ""
+
+#: siteconfig.php:2851
+msgid "Affiliation sucessfully added; reloading page"
+msgstr ""
+
+#: siteconfig.php:2852
+msgid "Affiliation sucessfully deleted; reloading page"
+msgstr ""
+
+#: siteconfig.php:2853
+msgid "Values updated; reloading page"
+msgstr ""
+
+#: siteconfig.php:2855
+msgid "Invalid value - must"
+msgstr ""
+
+#: siteconfig.php:3078
+msgid "Affiliation already exists"
+msgstr ""
+
+#: siteconfig.php:3084
+msgid "Conflicting Affiliation submitted"
+msgstr ""
+
#: statistics.php:44
msgid "Statistic Information"
msgstr "Información Estadística"
diff --git a/web/locale/po_files/es_MX/vcl.po b/web/locale/po_files/es_MX/vcl.po
index 647068d..9ce5ea1 100644
--- a/web/locale/po_files/es_MX/vcl.po
+++ b/web/locale/po_files/es_MX/vcl.po
@@ -14,11 +14,11 @@
# limitations under the License.
msgid ""
msgstr ""
-"Project-Id-Version: Apache VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2016-07-14 22:19-0400\n"
-"PO-Revision-Date: 2015-03-06 17:15-0500\n"
-"Last-Translator: <jfthomps@apache.org>\n"
+"PO-Revision-Date: 2019-06-13 15:18-0400\n"
+"Last-Translator: Josh Thompson <jfthomps@apache.org>\n"
"Language-Team: \n"
"Language: es_MX\n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,93 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
+#: addomain.php:172
+msgid ""
+"Error encountered while trying to create new AD domain. Please contact an "
+"admin for assistance."
+msgstr ""
+
+#: addomain.php:420 addomain.php:538
+msgid ""
+"Domain DNS Name should be in the format domain.tld and can only contain "
+"letters, numbers, dashes(-), periods(.), and underscores(_) (e.g. "
+"myuniversity.edu)"
+msgstr ""
+
+#: addomain.php:421
+msgid "Domain DNS Name"
+msgstr ""
+
+#. username
+#: addomain.php:424 addomain.php:543
+msgid ""
+"Username cannot contain single (') or double (") quotes, less than "
+"(<), or greater than (>) and can be from 2 to 64 characters long"
+msgstr ""
+
+#: addomain.php:425
+msgid "Username"
+msgstr ""
+
+#. password
+#: addomain.php:428 addomain.php:550
+msgid "Password must be at least 4 characters long"
+msgstr ""
+
+#. confirm password
+#: addomain.php:431
+msgid "Confirm Password"
+msgstr ""
+
+#. use database hostname checkbox
+#: addomain.php:433
+msgid "Use Database Hostnames"
+msgstr ""
+
+#: addomain.php:439
+msgid "DNS Server(s)"
+msgstr ""
+
+#: addomain.php:458
+msgid ""
+"Each AD Domain should be a member of an AD Domain resource group. The "
+"following dialog will allow you to add the new AD Domain to a group."
+msgstr ""
+
+#: addomain.php:480
+msgid ""
+"domain name registered in DNS for Active Directory Domain (ex: ad.example."
+"com)"
+msgstr ""
+
+#: addomain.php:481
+msgid "These credentials will be used to register reserved computers with AD."
+msgstr ""
+
+#: addomain.php:482
+msgid ""
+"comma delimited list of IP addresses for DNS servers that handle Domain DNS"
+msgstr ""
+
+#: addomain.php:483
+msgid ""
+"Check this option if you like to have the computer object names within AD to "
+"match VM hostname stored within the VCL database"
+msgstr ""
+
+#: addomain.php:529
+msgid "An AD domain already exists with this name."
+msgstr ""
+
+#: addomain.php:533
+msgid "Submitted owner is not valid"
+msgstr ""
+
+#: addomain.php:561
+msgid ""
+"Invalid IP address specified for DNS Server - must be a valid IPV4 address"
+msgstr ""
+
#: authentication.php:157 utils.php:828
msgid "Welcome to the Virtual Computing Lab"
msgstr "Bienvenido al Laboratorio Virtual de Cómputo"
@@ -1010,6 +1097,10 @@
msgid "Location"
msgstr ""
+#: groups.php:286
+msgid "Delete Group"
+msgstr ""
+
#: help.php:216 help.php:248
msgid "Authentication Method"
msgstr ""
@@ -1409,6 +1500,18 @@
msgid "The following revisions are in use and cannot be deleted at this time:"
msgstr ""
+#: image.php:150 image.php:438
+msgid "Max Reservation Duration"
+msgstr ""
+
+#: image.php:1756
+msgid "Invalid Max Reservation Duration selected"
+msgstr ""
+
+#: image.php:1777
+msgid "Base OU cannot be changed for the selected AD Domain"
+msgstr ""
+
#: managementnode.php:295
msgid "Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 50 characters long."
msgstr ""
@@ -2674,6 +2777,14 @@
msgid "%s is now in the process of being updated to use the newly created revision."
msgstr ""
+#: requests.php:1069
+msgid "Reservation is in maintenance - Contact admin for help"
+msgstr ""
+
+#: requests.php:1075
+msgid "Reservation is being captured"
+msgstr ""
+
#: resource.php:172
msgid "Edit Grouping & Mapping"
msgstr ""
@@ -3042,6 +3153,192 @@
msgid "No changes to submitted message. Nothing saved."
msgstr ""
+#: siteconfig.php:873
+msgid "Failed to update data for these affiliations:"
+msgstr ""
+
+#: siteconfig.php:979
+msgid "Default value"
+msgstr ""
+
+#: siteconfig.php:1064
+msgid "You do not have access to modify the submitted setting."
+msgstr ""
+
+#: siteconfig.php:1090
+msgid "Failed to add submited value"
+msgstr ""
+
+#: siteconfig.php:1228
+#, php-format
+msgid "Failed to delete address for %s"
+msgstr ""
+
+#: siteconfig.php:1272
+msgid "Help Email Address"
+msgstr ""
+
+#: siteconfig.php:1273
+msgid ""
+"This is the email address used as the from address for emails sent by the "
+"VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1278
+#, php-format
+msgid "Help Email Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1279 siteconfig.php:1378 siteconfig.php:1478
+#: siteconfig.php:1681 siteconfig.php:1813 siteconfig.php:1923
+msgid "Update successful"
+msgstr ""
+
+#: siteconfig.php:1280
+#, php-format
+msgid "Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1371
+msgid "Site Web Address"
+msgstr ""
+
+#: siteconfig.php:1372
+msgid "This is the web address in emails sent by the VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1374
+msgid "Invalid web address(es) specified"
+msgstr ""
+
+#: siteconfig.php:1377
+#, php-format
+msgid "Web Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1379
+#, php-format
+msgid "Web Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1470
+msgid "KMS Servers"
+msgstr ""
+
+#: siteconfig.php:1471
+msgid ""
+"These are the KMS servers for activating Windows licensing. Multiple servers "
+"are allowed, delimited with a comma (,). Non standard ports can be specified "
+"after the server delimited with a colon (:). (ex: kms.example.com,kms2."
+"example.com:2000)"
+msgstr ""
+
+#: siteconfig.php:1474
+msgid "Invalid IP or hostname specified"
+msgstr ""
+
+#: siteconfig.php:1477
+#, php-format
+msgid "KMS server added for %s"
+msgstr ""
+
+#: siteconfig.php:1479
+#, php-format
+msgid "KMS server for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1675
+msgid "Site Theme"
+msgstr ""
+
+#: siteconfig.php:1676
+msgid "This controls the theme of the site displayed for each affiliation."
+msgstr ""
+
+#: siteconfig.php:1677
+msgid "Invalid theme specified"
+msgstr ""
+
+#: siteconfig.php:1680
+#, php-format
+msgid "Theme setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1682
+#, php-format
+msgid "Theme setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1807
+msgid "LDAP Lookup for Shibboleth Authenticated Users"
+msgstr ""
+
+#: siteconfig.php:1808
+msgid ""
+"If an affiliation gets configured for Shibboleth authentication, this "
+"specifies that LDAP authentication has also been configured for that "
+"affiliation so that VCL can perform lookups for new users before they log in "
+"to VCL."
+msgstr ""
+
+#: siteconfig.php:1812
+#, php-format
+msgid "LDAP lookup setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1814
+#, php-format
+msgid "LDAP lookup setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1819 siteconfig.php:1928
+msgid "Local"
+msgstr ""
+
+#: siteconfig.php:1917
+msgid "Shibboleth Scope"
+msgstr ""
+
+#: siteconfig.php:1918
+msgid ""
+"This is the Shibboleth scope for an affiliation when Shibboleth "
+"authentication is enabled."
+msgstr ""
+
+#: siteconfig.php:1922
+#, php-format
+msgid "Shibboleth scope added for %s"
+msgstr ""
+
+#: siteconfig.php:1924
+#, php-format
+msgid "Shibboleth scope for %s deleted"
+msgstr ""
+
+#: siteconfig.php:2851
+msgid "Affiliation sucessfully added; reloading page"
+msgstr ""
+
+#: siteconfig.php:2852
+msgid "Affiliation sucessfully deleted; reloading page"
+msgstr ""
+
+#: siteconfig.php:2853
+msgid "Values updated; reloading page"
+msgstr ""
+
+#: siteconfig.php:2855
+msgid "Invalid value - must"
+msgstr ""
+
+#: siteconfig.php:3078
+msgid "Affiliation already exists"
+msgstr ""
+
+#: siteconfig.php:3084
+msgid "Conflicting Affiliation submitted"
+msgstr ""
+
#: statistics.php:44
msgid "Statistic Information"
msgstr "Información Estadística"
diff --git a/web/locale/po_files/fr_CA/vcl.po b/web/locale/po_files/fr_CA/vcl.po
index 20967d1..dba6843 100644
--- a/web/locale/po_files/fr_CA/vcl.po
+++ b/web/locale/po_files/fr_CA/vcl.po
@@ -14,10 +14,10 @@
# limitations under the License.
msgid ""
msgstr ""
-"Project-Id-Version: Apache VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2016-07-14 22:19-0400\n"
-"PO-Revision-Date: 2015-04-16 15:07+0000\n"
+"PO-Revision-Date: 2019-06-13 15:18-0400\n"
"Last-Translator: Charles Roger SIMEU <crsimeu@yahoo.fr>\n"
"Language-Team: \n"
"Language: fr_CA\n"
@@ -25,6 +25,93 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: addomain.php:172
+msgid ""
+"Error encountered while trying to create new AD domain. Please contact an "
+"admin for assistance."
+msgstr ""
+
+#: addomain.php:420 addomain.php:538
+msgid ""
+"Domain DNS Name should be in the format domain.tld and can only contain "
+"letters, numbers, dashes(-), periods(.), and underscores(_) (e.g. "
+"myuniversity.edu)"
+msgstr ""
+
+#: addomain.php:421
+msgid "Domain DNS Name"
+msgstr ""
+
+#. username
+#: addomain.php:424 addomain.php:543
+msgid ""
+"Username cannot contain single (') or double (") quotes, less than "
+"(<), or greater than (>) and can be from 2 to 64 characters long"
+msgstr ""
+
+#: addomain.php:425
+msgid "Username"
+msgstr ""
+
+#. password
+#: addomain.php:428 addomain.php:550
+msgid "Password must be at least 4 characters long"
+msgstr ""
+
+#. confirm password
+#: addomain.php:431
+msgid "Confirm Password"
+msgstr ""
+
+#. use database hostname checkbox
+#: addomain.php:433
+msgid "Use Database Hostnames"
+msgstr ""
+
+#: addomain.php:439
+msgid "DNS Server(s)"
+msgstr ""
+
+#: addomain.php:458
+msgid ""
+"Each AD Domain should be a member of an AD Domain resource group. The "
+"following dialog will allow you to add the new AD Domain to a group."
+msgstr ""
+
+#: addomain.php:480
+msgid ""
+"domain name registered in DNS for Active Directory Domain (ex: ad.example."
+"com)"
+msgstr ""
+
+#: addomain.php:481
+msgid "These credentials will be used to register reserved computers with AD."
+msgstr ""
+
+#: addomain.php:482
+msgid ""
+"comma delimited list of IP addresses for DNS servers that handle Domain DNS"
+msgstr ""
+
+#: addomain.php:483
+msgid ""
+"Check this option if you like to have the computer object names within AD to "
+"match VM hostname stored within the VCL database"
+msgstr ""
+
+#: addomain.php:529
+msgid "An AD domain already exists with this name."
+msgstr ""
+
+#: addomain.php:533
+msgid "Submitted owner is not valid"
+msgstr ""
+
+#: addomain.php:561
+msgid ""
+"Invalid IP address specified for DNS Server - must be a valid IPV4 address"
+msgstr ""
+
#: authentication.php:157 utils.php:828
msgid "Welcome to the Virtual Computing Lab"
msgstr "Bienvenue au laboratoire Informatique Virtuel (VCL)"
@@ -1009,6 +1096,10 @@
msgid "Location"
msgstr ""
+#: groups.php:286
+msgid "Delete Group"
+msgstr ""
+
#: help.php:216 help.php:248
msgid "Authentication Method"
msgstr ""
@@ -1408,6 +1499,18 @@
msgid "The following revisions are in use and cannot be deleted at this time:"
msgstr "Les révisions suivantes sont en cours d'utilisation et ne peuvent être supprimées pour l'instant"
+#: image.php:150 image.php:438
+msgid "Max Reservation Duration"
+msgstr ""
+
+#: image.php:1756
+msgid "Invalid Max Reservation Duration selected"
+msgstr ""
+
+#: image.php:1777
+msgid "Base OU cannot be changed for the selected AD Domain"
+msgstr ""
+
#: managementnode.php:295
msgid "Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 50 characters long."
msgstr ""
@@ -2673,6 +2776,14 @@
msgid "%s is now in the process of being updated to use the newly created revision."
msgstr "%s est maintenant dans le processus de mise à jour pour utiliser la nouvelle révision créée"
+#: requests.php:1069
+msgid "Reservation is in maintenance - Contact admin for help"
+msgstr ""
+
+#: requests.php:1075
+msgid "Reservation is being captured"
+msgstr ""
+
#: resource.php:172
msgid "Edit Grouping & Mapping"
msgstr "Éditer les groupages et les mappages"
@@ -3041,6 +3152,192 @@
msgid "No changes to submitted message. Nothing saved."
msgstr ""
+#: siteconfig.php:873
+msgid "Failed to update data for these affiliations:"
+msgstr ""
+
+#: siteconfig.php:979
+msgid "Default value"
+msgstr ""
+
+#: siteconfig.php:1064
+msgid "You do not have access to modify the submitted setting."
+msgstr ""
+
+#: siteconfig.php:1090
+msgid "Failed to add submited value"
+msgstr ""
+
+#: siteconfig.php:1228
+#, php-format
+msgid "Failed to delete address for %s"
+msgstr ""
+
+#: siteconfig.php:1272
+msgid "Help Email Address"
+msgstr ""
+
+#: siteconfig.php:1273
+msgid ""
+"This is the email address used as the from address for emails sent by the "
+"VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1278
+#, php-format
+msgid "Help Email Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1279 siteconfig.php:1378 siteconfig.php:1478
+#: siteconfig.php:1681 siteconfig.php:1813 siteconfig.php:1923
+msgid "Update successful"
+msgstr ""
+
+#: siteconfig.php:1280
+#, php-format
+msgid "Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1371
+msgid "Site Web Address"
+msgstr ""
+
+#: siteconfig.php:1372
+msgid "This is the web address in emails sent by the VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1374
+msgid "Invalid web address(es) specified"
+msgstr ""
+
+#: siteconfig.php:1377
+#, php-format
+msgid "Web Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1379
+#, php-format
+msgid "Web Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1470
+msgid "KMS Servers"
+msgstr ""
+
+#: siteconfig.php:1471
+msgid ""
+"These are the KMS servers for activating Windows licensing. Multiple servers "
+"are allowed, delimited with a comma (,). Non standard ports can be specified "
+"after the server delimited with a colon (:). (ex: kms.example.com,kms2."
+"example.com:2000)"
+msgstr ""
+
+#: siteconfig.php:1474
+msgid "Invalid IP or hostname specified"
+msgstr ""
+
+#: siteconfig.php:1477
+#, php-format
+msgid "KMS server added for %s"
+msgstr ""
+
+#: siteconfig.php:1479
+#, php-format
+msgid "KMS server for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1675
+msgid "Site Theme"
+msgstr ""
+
+#: siteconfig.php:1676
+msgid "This controls the theme of the site displayed for each affiliation."
+msgstr ""
+
+#: siteconfig.php:1677
+msgid "Invalid theme specified"
+msgstr ""
+
+#: siteconfig.php:1680
+#, php-format
+msgid "Theme setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1682
+#, php-format
+msgid "Theme setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1807
+msgid "LDAP Lookup for Shibboleth Authenticated Users"
+msgstr ""
+
+#: siteconfig.php:1808
+msgid ""
+"If an affiliation gets configured for Shibboleth authentication, this "
+"specifies that LDAP authentication has also been configured for that "
+"affiliation so that VCL can perform lookups for new users before they log in "
+"to VCL."
+msgstr ""
+
+#: siteconfig.php:1812
+#, php-format
+msgid "LDAP lookup setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1814
+#, php-format
+msgid "LDAP lookup setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1819 siteconfig.php:1928
+msgid "Local"
+msgstr ""
+
+#: siteconfig.php:1917
+msgid "Shibboleth Scope"
+msgstr ""
+
+#: siteconfig.php:1918
+msgid ""
+"This is the Shibboleth scope for an affiliation when Shibboleth "
+"authentication is enabled."
+msgstr ""
+
+#: siteconfig.php:1922
+#, php-format
+msgid "Shibboleth scope added for %s"
+msgstr ""
+
+#: siteconfig.php:1924
+#, php-format
+msgid "Shibboleth scope for %s deleted"
+msgstr ""
+
+#: siteconfig.php:2851
+msgid "Affiliation sucessfully added; reloading page"
+msgstr ""
+
+#: siteconfig.php:2852
+msgid "Affiliation sucessfully deleted; reloading page"
+msgstr ""
+
+#: siteconfig.php:2853
+msgid "Values updated; reloading page"
+msgstr ""
+
+#: siteconfig.php:2855
+msgid "Invalid value - must"
+msgstr ""
+
+#: siteconfig.php:3078
+msgid "Affiliation already exists"
+msgstr ""
+
+#: siteconfig.php:3084
+msgid "Conflicting Affiliation submitted"
+msgstr ""
+
#: statistics.php:44
msgid "Statistic Information"
msgstr "Informations statistiques"
diff --git a/web/locale/po_files/ja_JP/vcl.po b/web/locale/po_files/ja_JP/vcl.po
index 71ce1de..547b1c5 100644
--- a/web/locale/po_files/ja_JP/vcl.po
+++ b/web/locale/po_files/ja_JP/vcl.po
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
-"Project-Id-Version: VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2011-02-24 15:16+0900\n"
"PO-Revision-Date: 2012-04-13 15:40-0500\n"
diff --git a/web/locale/po_files/pt_PT/vcl.po b/web/locale/po_files/pt_PT/vcl.po
index b1375b4..cf649dd 100644
--- a/web/locale/po_files/pt_PT/vcl.po
+++ b/web/locale/po_files/pt_PT/vcl.po
@@ -14,10 +14,10 @@
# limitations under the License.
msgid ""
msgstr ""
-"Project-Id-Version: VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2016-07-14 22:19-0400\n"
-"PO-Revision-Date: 2015-04-22 13:44+0100\n"
+"PO-Revision-Date: 2019-06-13 15:18-0400\n"
"Last-Translator: António Aragão <aaragao@di.uminho.pt>\n"
"Language-Team: PT\n"
"Language: pt\n"
@@ -26,6 +26,93 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
+#: addomain.php:172
+msgid ""
+"Error encountered while trying to create new AD domain. Please contact an "
+"admin for assistance."
+msgstr ""
+
+#: addomain.php:420 addomain.php:538
+msgid ""
+"Domain DNS Name should be in the format domain.tld and can only contain "
+"letters, numbers, dashes(-), periods(.), and underscores(_) (e.g. "
+"myuniversity.edu)"
+msgstr ""
+
+#: addomain.php:421
+msgid "Domain DNS Name"
+msgstr ""
+
+#. username
+#: addomain.php:424 addomain.php:543
+msgid ""
+"Username cannot contain single (') or double (") quotes, less than "
+"(<), or greater than (>) and can be from 2 to 64 characters long"
+msgstr ""
+
+#: addomain.php:425
+msgid "Username"
+msgstr ""
+
+#. password
+#: addomain.php:428 addomain.php:550
+msgid "Password must be at least 4 characters long"
+msgstr ""
+
+#. confirm password
+#: addomain.php:431
+msgid "Confirm Password"
+msgstr ""
+
+#. use database hostname checkbox
+#: addomain.php:433
+msgid "Use Database Hostnames"
+msgstr ""
+
+#: addomain.php:439
+msgid "DNS Server(s)"
+msgstr ""
+
+#: addomain.php:458
+msgid ""
+"Each AD Domain should be a member of an AD Domain resource group. The "
+"following dialog will allow you to add the new AD Domain to a group."
+msgstr ""
+
+#: addomain.php:480
+msgid ""
+"domain name registered in DNS for Active Directory Domain (ex: ad.example."
+"com)"
+msgstr ""
+
+#: addomain.php:481
+msgid "These credentials will be used to register reserved computers with AD."
+msgstr ""
+
+#: addomain.php:482
+msgid ""
+"comma delimited list of IP addresses for DNS servers that handle Domain DNS"
+msgstr ""
+
+#: addomain.php:483
+msgid ""
+"Check this option if you like to have the computer object names within AD to "
+"match VM hostname stored within the VCL database"
+msgstr ""
+
+#: addomain.php:529
+msgid "An AD domain already exists with this name."
+msgstr ""
+
+#: addomain.php:533
+msgid "Submitted owner is not valid"
+msgstr ""
+
+#: addomain.php:561
+msgid ""
+"Invalid IP address specified for DNS Server - must be a valid IPV4 address"
+msgstr ""
+
#: authentication.php:157 utils.php:828
msgid "Welcome to the Virtual Computing Lab"
msgstr "Bemvindo ao Laboratório de Computação Virtual"
@@ -695,6 +782,10 @@
msgid "The end time for the submitted block allocation time has passed. Therefore, it can no longer be modified."
msgstr "O tempo de finalização submetido para este bloco de alocação já passou. Sendo assim já não pode ser modificado."
+#: blockallocations.php:2860
+msgid "The selected Block Allocation no longer exists."
+msgstr "O Bloco de Alocação escolhido já não existe."
+
#: blockallocations.php:2878
msgid "Resources"
msgstr "Recursos"
@@ -1006,6 +1097,10 @@
msgid "Location"
msgstr ""
+#: groups.php:286
+msgid "Delete Group"
+msgstr ""
+
#: help.php:216 help.php:248
msgid "Authentication Method"
msgstr ""
@@ -1405,6 +1500,18 @@
msgid "The following revisions are in use and cannot be deleted at this time:"
msgstr "As seguintes revisões estão em uso e não podem ser excluídas neste momento:"
+#: image.php:150 image.php:438
+msgid "Max Reservation Duration"
+msgstr ""
+
+#: image.php:1756
+msgid "Invalid Max Reservation Duration selected"
+msgstr ""
+
+#: image.php:1777
+msgid "Base OU cannot be changed for the selected AD Domain"
+msgstr ""
+
#: managementnode.php:295
msgid "Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 50 characters long."
msgstr ""
@@ -2075,6 +2182,10 @@
msgid "Please select the environment you want to use from the list:"
msgstr "Por favor escolha um ambiente para usar através da seguinte lista:"
+#: requests.php:1530
+msgid "Please select a valid environment"
+msgstr "Por favor escolha um ambiente válido"
+
#: requests.php:1546
msgid "Reservation Name:"
msgstr "Nome da Reserva:"
@@ -2288,6 +2399,10 @@
msgid "Value:"
msgstr "Valor:"
+#: requests.php:2611
+msgid "Value can only contain letters, numbers, spaces, dashes(-), parenthesis, <br>slashes(/), and periods(.) and can be from 3 to 255 characters long"
+msgstr ""
+
#: requests.php:2621
msgid "Required:"
msgstr "Requerido:"
@@ -2662,6 +2777,14 @@
msgid "%s is now in the process of being updated to use the newly created revision."
msgstr "%s está agora em vias de ser atualizado para ser usado como nova revisão."
+#: requests.php:1069
+msgid "Reservation is in maintenance - Contact admin for help"
+msgstr ""
+
+#: requests.php:1075
+msgid "Reservation is being captured"
+msgstr ""
+
#: resource.php:172
msgid "Edit Grouping & Mapping"
msgstr "Alterando o Agrupamento & Mapeando"
@@ -3030,6 +3153,192 @@
msgid "No changes to submitted message. Nothing saved."
msgstr ""
+#: siteconfig.php:873
+msgid "Failed to update data for these affiliations:"
+msgstr ""
+
+#: siteconfig.php:979
+msgid "Default value"
+msgstr ""
+
+#: siteconfig.php:1064
+msgid "You do not have access to modify the submitted setting."
+msgstr ""
+
+#: siteconfig.php:1090
+msgid "Failed to add submited value"
+msgstr ""
+
+#: siteconfig.php:1228
+#, php-format
+msgid "Failed to delete address for %s"
+msgstr ""
+
+#: siteconfig.php:1272
+msgid "Help Email Address"
+msgstr ""
+
+#: siteconfig.php:1273
+msgid ""
+"This is the email address used as the from address for emails sent by the "
+"VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1278
+#, php-format
+msgid "Help Email Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1279 siteconfig.php:1378 siteconfig.php:1478
+#: siteconfig.php:1681 siteconfig.php:1813 siteconfig.php:1923
+msgid "Update successful"
+msgstr ""
+
+#: siteconfig.php:1280
+#, php-format
+msgid "Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1371
+msgid "Site Web Address"
+msgstr ""
+
+#: siteconfig.php:1372
+msgid "This is the web address in emails sent by the VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1374
+msgid "Invalid web address(es) specified"
+msgstr ""
+
+#: siteconfig.php:1377
+#, php-format
+msgid "Web Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1379
+#, php-format
+msgid "Web Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1470
+msgid "KMS Servers"
+msgstr ""
+
+#: siteconfig.php:1471
+msgid ""
+"These are the KMS servers for activating Windows licensing. Multiple servers "
+"are allowed, delimited with a comma (,). Non standard ports can be specified "
+"after the server delimited with a colon (:). (ex: kms.example.com,kms2."
+"example.com:2000)"
+msgstr ""
+
+#: siteconfig.php:1474
+msgid "Invalid IP or hostname specified"
+msgstr ""
+
+#: siteconfig.php:1477
+#, php-format
+msgid "KMS server added for %s"
+msgstr ""
+
+#: siteconfig.php:1479
+#, php-format
+msgid "KMS server for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1675
+msgid "Site Theme"
+msgstr ""
+
+#: siteconfig.php:1676
+msgid "This controls the theme of the site displayed for each affiliation."
+msgstr ""
+
+#: siteconfig.php:1677
+msgid "Invalid theme specified"
+msgstr ""
+
+#: siteconfig.php:1680
+#, php-format
+msgid "Theme setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1682
+#, php-format
+msgid "Theme setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1807
+msgid "LDAP Lookup for Shibboleth Authenticated Users"
+msgstr ""
+
+#: siteconfig.php:1808
+msgid ""
+"If an affiliation gets configured for Shibboleth authentication, this "
+"specifies that LDAP authentication has also been configured for that "
+"affiliation so that VCL can perform lookups for new users before they log in "
+"to VCL."
+msgstr ""
+
+#: siteconfig.php:1812
+#, php-format
+msgid "LDAP lookup setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1814
+#, php-format
+msgid "LDAP lookup setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1819 siteconfig.php:1928
+msgid "Local"
+msgstr ""
+
+#: siteconfig.php:1917
+msgid "Shibboleth Scope"
+msgstr ""
+
+#: siteconfig.php:1918
+msgid ""
+"This is the Shibboleth scope for an affiliation when Shibboleth "
+"authentication is enabled."
+msgstr ""
+
+#: siteconfig.php:1922
+#, php-format
+msgid "Shibboleth scope added for %s"
+msgstr ""
+
+#: siteconfig.php:1924
+#, php-format
+msgid "Shibboleth scope for %s deleted"
+msgstr ""
+
+#: siteconfig.php:2851
+msgid "Affiliation sucessfully added; reloading page"
+msgstr ""
+
+#: siteconfig.php:2852
+msgid "Affiliation sucessfully deleted; reloading page"
+msgstr ""
+
+#: siteconfig.php:2853
+msgid "Values updated; reloading page"
+msgstr ""
+
+#: siteconfig.php:2855
+msgid "Invalid value - must"
+msgstr ""
+
+#: siteconfig.php:3078
+msgid "Affiliation already exists"
+msgstr ""
+
+#: siteconfig.php:3084
+msgid "Conflicting Affiliation submitted"
+msgstr ""
+
#: statistics.php:44
msgid "Statistic Information"
msgstr "Informação Estatística"
@@ -4056,9 +4365,6 @@
msgid "monthly"
msgstr "mensalmente"
-msgid "Please select a valid environment"
-msgstr "Por favor escolha um ambiente válido"
-
msgid "starting install process"
msgstr "começando o processo de instalação"
@@ -4107,9 +4413,6 @@
msgid "starting virtual machine"
msgstr ""
-msgid "The selected Block Allocation no longer exists."
-msgstr "O Bloco de Alocação escolhido já não existe."
-
msgid "Log in"
msgstr ""
diff --git a/web/locale/po_files/vcl.po.template b/web/locale/po_files/vcl.po.template
index beb7cf1..bd58afc 100644
--- a/web/locale/po_files/vcl.po.template
+++ b/web/locale/po_files/vcl.po.template
@@ -16,10 +16,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2016-07-14 22:19-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2019-06-13 15:18-0400\n"
"Last-Translator: Josh Thompson <jfthomps@apache.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -27,6 +27,92 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: addomain.php:172
+msgid ""
+"Error encountered while trying to create new AD domain. Please contact an "
+"admin for assistance."
+msgstr ""
+
+#: addomain.php:420 addomain.php:538
+msgid ""
+"Domain DNS Name should be in the format domain.tld and can only contain "
+"letters, numbers, dashes(-), periods(.), and underscores(_) (e.g. "
+"myuniversity.edu)"
+msgstr ""
+
+#: addomain.php:421
+msgid "Domain DNS Name"
+msgstr ""
+
+#. username
+#: addomain.php:424 addomain.php:543
+msgid ""
+"Username cannot contain single (') or double (") quotes, less than "
+"(<), or greater than (>) and can be from 2 to 64 characters long"
+msgstr ""
+
+#: addomain.php:425
+msgid "Username"
+msgstr ""
+
+#. password
+#: addomain.php:428 addomain.php:550
+msgid "Password must be at least 4 characters long"
+msgstr ""
+
+#. confirm password
+#: addomain.php:431
+msgid "Confirm Password"
+msgstr ""
+
+#. use database hostname checkbox
+#: addomain.php:433
+msgid "Use Database Hostnames"
+msgstr ""
+
+#: addomain.php:439
+msgid "DNS Server(s)"
+msgstr ""
+
+#: addomain.php:458
+msgid ""
+"Each AD Domain should be a member of an AD Domain resource group. The "
+"following dialog will allow you to add the new AD Domain to a group."
+msgstr ""
+
+#: addomain.php:480
+msgid ""
+"domain name registered in DNS for Active Directory Domain (ex: ad.example."
+"com)"
+msgstr ""
+
+#: addomain.php:481
+msgid "These credentials will be used to register reserved computers with AD."
+msgstr ""
+
+#: addomain.php:482
+msgid ""
+"comma delimited list of IP addresses for DNS servers that handle Domain DNS"
+msgstr ""
+
+#: addomain.php:483
+msgid ""
+"Check this option if you like to have the computer object names within AD to "
+"match VM hostname stored within the VCL database"
+msgstr ""
+
+#: addomain.php:529
+msgid "An AD domain already exists with this name."
+msgstr ""
+
+#: addomain.php:533
+msgid "Submitted owner is not valid"
+msgstr ""
+
+#: addomain.php:561
+msgid ""
+"Invalid IP address specified for DNS Server - must be a valid IPV4 address"
+
#: authentication.php:157 utils.php:828
msgid "Welcome to the Virtual Computing Lab"
msgstr ""
@@ -1011,6 +1097,10 @@
msgid "Location"
msgstr ""
+#: groups.php:286
+msgid "Delete Group"
+msgstr ""
+
#: help.php:216 help.php:248
msgid "Authentication Method"
msgstr ""
@@ -1410,6 +1500,18 @@
msgid "The following revisions are in use and cannot be deleted at this time:"
msgstr ""
+#: image.php:150 image.php:438
+msgid "Max Reservation Duration"
+msgstr ""
+
+#: image.php:1756
+msgid "Invalid Max Reservation Duration selected"
+msgstr ""
+
+#: image.php:1777
+msgid "Base OU cannot be changed for the selected AD Domain"
+msgstr ""
+
#: managementnode.php:295
msgid "Name can only contain letters, numbers, dashes(-), periods(.), and underscores(_). It can be from 1 to 50 characters long."
msgstr ""
@@ -2675,6 +2777,14 @@
msgid "%s is now in the process of being updated to use the newly created revision."
msgstr ""
+#: requests.php:1069
+msgid "Reservation is in maintenance - Contact admin for help"
+msgstr ""
+
+#: requests.php:1075
+msgid "Reservation is being captured"
+msgstr ""
+
#: resource.php:172
msgid "Edit Grouping & Mapping"
msgstr ""
@@ -3043,6 +3153,192 @@
msgid "No changes to submitted message. Nothing saved."
msgstr ""
+#: siteconfig.php:873
+msgid "Failed to update data for these affiliations:"
+msgstr ""
+
+#: siteconfig.php:979
+msgid "Default value"
+msgstr ""
+
+#: siteconfig.php:1064
+msgid "You do not have access to modify the submitted setting."
+msgstr ""
+
+#: siteconfig.php:1090
+msgid "Failed to add submited value"
+msgstr ""
+
+#: siteconfig.php:1228
+#, php-format
+msgid "Failed to delete address for %s"
+msgstr ""
+
+#: siteconfig.php:1272
+msgid "Help Email Address"
+msgstr ""
+
+#: siteconfig.php:1273
+msgid ""
+"This is the email address used as the from address for emails sent by the "
+"VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1278
+#, php-format
+msgid "Help Email Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1279 siteconfig.php:1378 siteconfig.php:1478
+#: siteconfig.php:1681 siteconfig.php:1813 siteconfig.php:1923
+msgid "Update successful"
+msgstr ""
+
+#: siteconfig.php:1280
+#, php-format
+msgid "Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1371
+msgid "Site Web Address"
+msgstr ""
+
+#: siteconfig.php:1372
+msgid "This is the web address in emails sent by the VCL system to users."
+msgstr ""
+
+#: siteconfig.php:1374
+msgid "Invalid web address(es) specified"
+msgstr ""
+
+#: siteconfig.php:1377
+#, php-format
+msgid "Web Address added for %s"
+msgstr ""
+
+#: siteconfig.php:1379
+#, php-format
+msgid "Web Address for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1470
+msgid "KMS Servers"
+msgstr ""
+
+#: siteconfig.php:1471
+msgid ""
+"These are the KMS servers for activating Windows licensing. Multiple servers "
+"are allowed, delimited with a comma (,). Non standard ports can be specified "
+"after the server delimited with a colon (:). (ex: kms.example.com,kms2."
+"example.com:2000)"
+msgstr ""
+
+#: siteconfig.php:1474
+msgid "Invalid IP or hostname specified"
+msgstr ""
+
+#: siteconfig.php:1477
+#, php-format
+msgid "KMS server added for %s"
+msgstr ""
+
+#: siteconfig.php:1479
+#, php-format
+msgid "KMS server for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1675
+msgid "Site Theme"
+msgstr ""
+
+#: siteconfig.php:1676
+msgid "This controls the theme of the site displayed for each affiliation."
+msgstr ""
+
+#: siteconfig.php:1677
+msgid "Invalid theme specified"
+msgstr ""
+
+#: siteconfig.php:1680
+#, php-format
+msgid "Theme setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1682
+#, php-format
+msgid "Theme setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1807
+msgid "LDAP Lookup for Shibboleth Authenticated Users"
+msgstr ""
+
+#: siteconfig.php:1808
+msgid ""
+"If an affiliation gets configured for Shibboleth authentication, this "
+"specifies that LDAP authentication has also been configured for that "
+"affiliation so that VCL can perform lookups for new users before they log in "
+"to VCL."
+msgstr ""
+
+#: siteconfig.php:1812
+#, php-format
+msgid "LDAP lookup setting added for %s"
+msgstr ""
+
+#: siteconfig.php:1814
+#, php-format
+msgid "LDAP lookup setting for %s deleted"
+msgstr ""
+
+#: siteconfig.php:1819 siteconfig.php:1928
+msgid "Local"
+msgstr ""
+
+#: siteconfig.php:1917
+msgid "Shibboleth Scope"
+msgstr ""
+
+#: siteconfig.php:1918
+msgid ""
+"This is the Shibboleth scope for an affiliation when Shibboleth "
+"authentication is enabled."
+msgstr ""
+
+#: siteconfig.php:1922
+#, php-format
+msgid "Shibboleth scope added for %s"
+msgstr ""
+
+#: siteconfig.php:1924
+#, php-format
+msgid "Shibboleth scope for %s deleted"
+msgstr ""
+
+#: siteconfig.php:2851
+msgid "Affiliation sucessfully added; reloading page"
+msgstr ""
+
+#: siteconfig.php:2852
+msgid "Affiliation sucessfully deleted; reloading page"
+msgstr ""
+
+#: siteconfig.php:2853
+msgid "Values updated; reloading page"
+msgstr ""
+
+#: siteconfig.php:2855
+msgid "Invalid value - must"
+msgstr ""
+
+#: siteconfig.php:3078
+msgid "Affiliation already exists"
+msgstr ""
+
+#: siteconfig.php:3084
+msgid "Conflicting Affiliation submitted"
+msgstr ""
+
#: statistics.php:44
msgid "Statistic Information"
msgstr ""
diff --git a/web/locale/po_files/zh_CN/vcl.po b/web/locale/po_files/zh_CN/vcl.po
index 734ebb1..efc8693 100644
--- a/web/locale/po_files/zh_CN/vcl.po
+++ b/web/locale/po_files/zh_CN/vcl.po
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
-"Project-Id-Version: VCL 2.5\n"
+"Project-Id-Version: VCL 2.5.1\n"
"Report-Msgid-Bugs-To: dev@vcl.apache.org\n"
"POT-Creation-Date: 2011-02-24 15:16+0900\n"
"PO-Revision-Date: 2012-04-13 15:40-0500\n"
diff --git a/web/locale/pt_PT/LC_MESSAGES/vcl.mo b/web/locale/pt_PT/LC_MESSAGES/vcl.mo
index e3884ef..bc38f41 100644
--- a/web/locale/pt_PT/LC_MESSAGES/vcl.mo
+++ b/web/locale/pt_PT/LC_MESSAGES/vcl.mo
Binary files differ
diff --git a/web/locale/zh_CN/LC_MESSAGES/vcl.mo b/web/locale/zh_CN/LC_MESSAGES/vcl.mo
index 061a86f..c902da4 100644
--- a/web/locale/zh_CN/LC_MESSAGES/vcl.mo
+++ b/web/locale/zh_CN/LC_MESSAGES/vcl.mo
Binary files differ
