You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/23 14:21:02 UTC
[01/13] airavata git commit: Updating dREG storage resource id to
actual Jetstream one
Repository: airavata
Updated Branches:
refs/heads/develop f19cc0cd9 -> 701f36a7a
Updating dREG storage resource id to actual Jetstream one
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/64b55702
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/64b55702
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/64b55702
Branch: refs/heads/develop
Commit: 64b55702d4db791af3b1ffa0db5ad4932d6f2932
Parents: 45e8f65
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue May 2 12:30:55 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue May 2 12:30:55 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/dreg-production/group_vars/pga/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/64b55702/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
index 4f15b2b..5eed223 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
@@ -53,7 +53,7 @@ initial_role_name: "gateway-user"
gateway_id: "cornelldna"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/cornell-dnasequence"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_resource_id: "js-156-72.jetstream-cloud.org_758cf5c0-71f4-4268-bb42-5ede23cfeea9"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTs6k2lSt5nn+UF3N1rAko9WjdtHZ1xLcKxCG4+4AVMdTIeng12g+1qB5hIFiDgesT/D/nzoA27EFj5nWiYanxBySNgl1Re8kR0nEqQbR0zj1dSibmfjW+vmOZzEiNSrNoLlc4KbFgqFCRGIlZ1bWZ7yHtJ3I7xxfKhvvxCTzJ4K71v1aovnDTUYophy2lUsdOcOq84Qhv3ITZafgblz3mJSwVpnnI72IepzonzDUdcf/w0lKCl70L9MgQAZ2V4e9sQZWJLI5s1VtJsqKggtgI4goPyxXROoH9PTUZFqvvYjLGW8JVS9eZKblSKil09yckPfZCSk1i/UD/uY6O7bjf"
## Portal related variables
[04/13] airavata git commit: fixing bug in moving checkpoint files
Posted by ma...@apache.org.
fixing bug in moving checkpoint files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1108b57c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1108b57c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1108b57c
Branch: refs/heads/develop
Commit: 1108b57c961ad2ffd684ed4bef6a8e7f84bf7088
Parents: 868fc55
Author: scnakandala <su...@gmail.com>
Authored: Wed May 3 16:04:16 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed May 3 17:19:16 2017 -0400
----------------------------------------------------------------------
.../gfac/core/cluster/RemoteCluster.java | 12 ++++++++-
.../airavata/gfac/impl/BESRemoteCluster.java | 22 +++++++++++++---
.../airavata/gfac/impl/HPCRemoteCluster.java | 27 ++++++++++++++++++++
.../airavata/gfac/impl/LocalRemoteCluster.java | 18 ++++++++++---
.../gfac/impl/task/SCPDataStageTask.java | 18 ++++++++++---
5 files changed, 87 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1108b57c/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
index 9a5c757..ebf5f6b 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
@@ -23,7 +23,6 @@ import com.jcraft.jsch.Session;
import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.SSHApiException;
import org.apache.airavata.gfac.core.authentication.AuthenticationInfo;
-import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication;
import org.apache.airavata.model.status.JobStatus;
import java.util.List;
@@ -79,6 +78,17 @@ public interface RemoteCluster { // FIXME: replace SSHApiException with suitable
boolean ignoreEmptyFile) throws GFacException;
/**
+ * This method can be used to get the file name of a file giving the extension. It assumes that there will be only
+ * one file with that extension. In case if there are more than one file one random file name from the matching ones
+ * will be returned.
+ * @param fileExtension
+ * @param parentPath
+ * @param session
+ * @return
+ */
+ public String getFileNameFromExtension(String fileExtension, String parentPath, Session session) throws GFacException;
+
+ /**
* This will create directories in computing resources
*
* @param directoryPath the full qualified path for the directory user wants to create
http://git-wip-us.apache.org/repos/asf/airavata/blob/1108b57c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BESRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BESRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BESRemoteCluster.java
index de0c70f..4f22c6a 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BESRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/BESRemoteCluster.java
@@ -22,10 +22,11 @@ package org.apache.airavata.gfac.impl;
import com.jcraft.jsch.Session;
import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.JobManagerConfiguration;
-import org.apache.airavata.gfac.core.SSHApiException;
import org.apache.airavata.gfac.core.authentication.AuthenticationInfo;
-import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication;
-import org.apache.airavata.gfac.core.cluster.*;
+import org.apache.airavata.gfac.core.cluster.AbstractRemoteCluster;
+import org.apache.airavata.gfac.core.cluster.CommandInfo;
+import org.apache.airavata.gfac.core.cluster.JobSubmissionOutput;
+import org.apache.airavata.gfac.core.cluster.ServerInfo;
import org.apache.airavata.model.status.JobStatus;
import java.util.List;
@@ -56,6 +57,21 @@ public class BESRemoteCluster extends AbstractRemoteCluster{
}
+ /**
+ * This method can be used to get the file name of a file giving the extension. It assumes that there will be only
+ * one file with that extension. In case if there are more than one file one random file name from the matching ones
+ * will be returned.
+ *
+ * @param fileExtension
+ * @param parentPath
+ * @param session
+ * @return
+ */
+ @Override
+ public String getFileNameFromExtension(String fileExtension, String parentPath, Session session) {
+ return null;
+ }
+
@Override
public void makeDirectory(String directoryPath) throws GFacException {
http://git-wip-us.apache.org/repos/asf/airavata/blob/1108b57c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
index c1bca29..3d972b0 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
@@ -190,6 +190,33 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{
}
}
+ /**
+ * This method can be used to get the file name of a file giving the extension. It assumes that there will be only
+ * one file with that extension. In case if there are more than one file one random file name from the matching ones
+ * will be returned.
+ *
+ * @param fileExtension
+ * @param parentPath
+ * @param session
+ * @return
+ */
+ @Override
+ public String getFileNameFromExtension(String fileExtension, String parentPath, Session session) throws GFacException {
+ try {
+ List<String> fileNames = SSHUtils.listDirectory(parentPath, session);
+ for(String fileName : fileNames){
+ if(fileName.endsWith(fileExtension)){
+ return fileName;
+ }
+ }
+ log.warn("No matching file found for extension: " + fileExtension + " in the " + parentPath + " directory");
+ return null;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new GFacException("Failed to list directory " + parentPath);
+ }
+ }
+
@Override
public void makeDirectory(String directoryPath) throws GFacException {
int retryCount = 0;
http://git-wip-us.apache.org/repos/asf/airavata/blob/1108b57c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalRemoteCluster.java
index 878e3b6..64a96db 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/LocalRemoteCluster.java
@@ -21,12 +21,9 @@ package org.apache.airavata.gfac.impl;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
-import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.JobManagerConfiguration;
-import org.apache.airavata.gfac.core.SSHApiException;
import org.apache.airavata.gfac.core.authentication.AuthenticationInfo;
-import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication;
import org.apache.airavata.gfac.core.cluster.*;
import org.apache.airavata.model.status.JobStatus;
import org.slf4j.Logger;
@@ -131,6 +128,21 @@ public class LocalRemoteCluster extends AbstractRemoteCluster {
}
}
+ /**
+ * This method can be used to get the file name of a file giving the extension. It assumes that there will be only
+ * one file with that extension. In case if there are more than one file one random file name from the matching ones
+ * will be returned.
+ *
+ * @param fileExtension
+ * @param parentPath
+ * @param session
+ * @return
+ */
+ @Override
+ public String getFileNameFromExtension(String fileExtension, String parentPath, Session session) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public void makeDirectory(String directoryPath) throws GFacException {
Path dirPath = Paths.get(directoryPath);
http://git-wip-us.apache.org/repos/asf/airavata/blob/1108b57c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index 4e4aa86..9a42124 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -133,6 +133,20 @@ public class SCPDataStageTask implements Task {
URI sourceURI = new URI(subTaskModel.getSource());
String fileName = sourceURI.getPath().substring(sourceURI.getPath().lastIndexOf(File.separator) + 1,
sourceURI.getPath().length());
+
+ authenticationInfo = Factory.getComputerResourceSSHKeyAuthentication(processContext);
+ ServerInfo serverInfo = processContext.getComputeResourceServerInfo();
+ Session sshSession = Factory.getSSHSession(authenticationInfo, serverInfo);
+
+ //Wildcard for file name. Has to find the correct name.
+ if(fileName.startsWith("*.")){
+ String temp = taskContext.getParentProcessContext().getDataMovementRemoteCluster()
+ .getFileNameFromExtension(fileName.substring(2), inputPath, sshSession);
+ if(temp != null && temp != ""){
+ fileName = temp;
+ }
+ }
+
URI destinationURI = null;
if (subTaskModel.getDestination().startsWith("dummy")) {
destinationURI = TaskUtils.getDestinationURI(taskContext, hostName, inputPath, fileName);
@@ -149,11 +163,9 @@ public class SCPDataStageTask implements Task {
return status;
}
- authenticationInfo = Factory.getComputerResourceSSHKeyAuthentication(processContext);
+
status = new TaskStatus(TaskState.COMPLETED);
- ServerInfo serverInfo = processContext.getComputeResourceServerInfo();
- Session sshSession = Factory.getSSHSession(authenticationInfo, serverInfo);
if (processState == ProcessState.INPUT_DATA_STAGING) {
inputDataStaging(taskContext, sshSession, sourceURI, destinationURI);
status.setReason("Successfully staged input data");
[08/13] airavata git commit: Disable SSLv3 in all virtual hosts to
prevent POODLE attack
Posted by ma...@apache.org.
Disable SSLv3 in all virtual hosts to prevent POODLE attack
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2265cbe6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2265cbe6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2265cbe6
Branch: refs/heads/develop
Commit: 2265cbe6f891de6153d879b924957ed42f708ef6
Parents: 3a82e02
Author: Marcus Christie <ma...@iu.edu>
Authored: Thu May 4 08:53:24 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Thu May 4 10:22:53 2017 -0400
----------------------------------------------------------------------
.../dreg-production/files/pga-ssl-vhost.conf.j2 | 2 +
dev-tools/ansible/roles/pga/defaults/main.yml | 4 +
dev-tools/ansible/roles/pga/defaults/ssl.conf | 216 ------------------
dev-tools/ansible/roles/pga/files/ssl.conf | 217 +++++++++++++++++++
dev-tools/ansible/roles/pga/tasks/main.yml | 8 +
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 2 +
6 files changed, 233 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2265cbe6/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
index ee053cc..c08c958 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
@@ -25,6 +25,8 @@
ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
SSLEngine on
+ # Disable SSLv3 which is vulnerable to the POODLE attack
+ SSLProtocol All -SSLv2 -SSLv3
SSLCertificateFile {{ ssl_certificate_file }}
SSLCertificateChainFile {{ ssl_certificate_chain_file }}
SSLCertificateKeyFile {{ ssl_certificate_key_file }}
http://git-wip-us.apache.org/repos/asf/airavata/blob/2265cbe6/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index f5fbad9..502449b 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -31,6 +31,10 @@ httpd_confd_file_location:
default_conf_file_location:
RedHat: "/etc/httpd/conf.d/default.conf"
Debian: "/etc/apache2/sites-available/default.conf"
+ssl_conf_file_location:
+ RedHat: "/etc/httpd/conf.d/ssl.conf"
+ # TODO: Debian file layout is different, so we really need a different ssl.conf for Debian
+ Debian: "/etc/apache2/mods-available/ssl.conf"
httpd_name:
Debian: apache2
RedHat: httpd
http://git-wip-us.apache.org/repos/asf/airavata/blob/2265cbe6/dev-tools/ansible/roles/pga/defaults/ssl.conf
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/ssl.conf b/dev-tools/ansible/roles/pga/defaults/ssl.conf
deleted file mode 100644
index b598990..0000000
--- a/dev-tools/ansible/roles/pga/defaults/ssl.conf
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# When we also provide SSL we have to listen to the
-# the HTTPS port in addition.
-#
-Listen 443 https
-
-##
-## SSL Global Context
-##
-## All SSL configuration in this context applies both to
-## the main server and all SSL-enabled virtual hosts.
-##
-
-# Pass Phrase Dialog:
-# Configure the pass phrase gathering process.
-# The filtering dialog program (`builtin' is a internal
-# terminal dialog) has to provide the pass phrase on stdout.
-SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
-
-# Inter-Process Session Cache:
-# Configure the SSL Session Cache: First the mechanism
-# to use and second the expiring timeout (in seconds).
-SSLSessionCache shmcb:/run/httpd/sslcache(512000)
-SSLSessionCacheTimeout 300
-
-# Pseudo Random Number Generator (PRNG):
-# Configure one or more sources to seed the PRNG of the
-# SSL library. The seed data should be of good random quality.
-# WARNING! On some platforms /dev/random blocks if not enough entropy
-# is available. This means you then cannot use the /dev/random device
-# because it would lead to very long connection times (as long as
-# it requires to make more entropy available). But usually those
-# platforms additionally provide a /dev/urandom device which doesn't
-# block. So, if available, use this one instead. Read the mod_ssl User
-# Manual for more details.
-SSLRandomSeed startup file:/dev/urandom 256
-SSLRandomSeed connect builtin
-#SSLRandomSeed startup file:/dev/random 512
-#SSLRandomSeed connect file:/dev/random 512
-#SSLRandomSeed connect file:/dev/urandom 512
-
-#
-# Use "SSLCryptoDevice" to enable any supported hardware
-# accelerators. Use "openssl engine -v" to list supported
-# engine names. NOTE: If you enable an accelerator and the
-# server does not start, consult the error logs and ensure
-# your accelerator is functioning properly.
-#
-SSLCryptoDevice builtin
-#SSLCryptoDevice ubsec
-
-##
-## SSL Virtual Host Context
-##
-
-<VirtualHost _default_:443>
-
-# General setup for the virtual host, inherited from global configuration
-#DocumentRoot "/var/www/html"
-#ServerName www.example.com:443
-
-# Use separate log files for the SSL virtual host; note that LogLevel
-# is not inherited from httpd.conf.
-ErrorLog logs/ssl_error_log
-TransferLog logs/ssl_access_log
-LogLevel warn
-
-# SSL Engine Switch:
-# Enable/Disable SSL for this virtual host.
-SSLEngine on
-
-# SSL Protocol support:
-# List the enable protocol levels with which clients will be able to
-# connect. Disable SSLv2 access by default:
-SSLProtocol all -SSLv2
-
-# SSL Cipher Suite:
-# List the ciphers that the client is permitted to negotiate.
-# See the mod_ssl documentation for a complete list.
-SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!SEED:!IDEA
-
-# Speed-optimized SSL Cipher configuration:
-# If speed is your main concern (on busy HTTPS servers e.g.),
-# you might want to force clients to specific, performance
-# optimized ciphers. In this case, prepend those ciphers
-# to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
-# Caveat: by giving precedence to RC4-SHA and AES128-SHA
-# (as in the example below), most connections will no longer
-# have perfect forward secrecy - if the server's key is
-# compromised, captures of past or future traffic must be
-# considered compromised, too.
-#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
-#SSLHonorCipherOrder on
-
-# Server Certificate:
-# Point SSLCertificateFile at a PEM encoded certificate. If
-# the certificate is encrypted, then you will be prompted for a
-# pass phrase. Note that a kill -HUP will prompt again. A new
-# certificate can be generated using the genkey(1) command.
-SSLCertificateFile /etc/pki/tls/certs/localhost.crt
-
-# Server Private Key:
-# If the key is not combined with the certificate, use this
-# directive to point at the key file. Keep in mind that if
-# you've both a RSA and a DSA private key you can configure
-# both in parallel (to also allow the use of DSA ciphers, etc.)
-SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-
-# Server Certificate Chain:
-# Point SSLCertificateChainFile at a file containing the
-# concatenation of PEM encoded CA certificates which form the
-# certificate chain for the server certificate. Alternatively
-# the referenced file can be the same as SSLCertificateFile
-# when the CA certificates are directly appended to the server
-# certificate for convinience.
-#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
-
-# Certificate Authority (CA):
-# Set the CA certificate verification path where to find CA
-# certificates for client authentication or alternatively one
-# huge file containing all of them (file must be PEM encoded)
-#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
-
-# Client Authentication (Type):
-# Client certificate verification type and depth. Types are
-# none, optional, require and optional_no_ca. Depth is a
-# number which specifies how deeply to verify the certificate
-# issuer chain before deciding the certificate is not valid.
-#SSLVerifyClient require
-#SSLVerifyDepth 10
-
-# Access Control:
-# With SSLRequire you can do per-directory access control based
-# on arbitrary complex boolean expressions containing server
-# variable checks and other lookup directives. The syntax is a
-# mixture between C and Perl. See the mod_ssl documentation
-# for more details.
-#<Location />
-#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
-# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
-# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
-# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
-# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
-# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
-#</Location>
-
-# SSL Engine Options:
-# Set various options for the SSL engine.
-# o FakeBasicAuth:
-# Translate the client X.509 into a Basic Authorisation. This means that
-# the standard Auth/DBMAuth methods can be used for access control. The
-# user name is the `one line' version of the client's X.509 certificate.
-# Note that no password is obtained from the user. Every entry in the user
-# file needs this password: `xxj31ZMTZzkVA'.
-# o ExportCertData:
-# This exports two additional environment variables: SSL_CLIENT_CERT and
-# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-# server (always existing) and the client (only existing when client
-# authentication is used). This can be used to import the certificates
-# into CGI scripts.
-# o StdEnvVars:
-# This exports the standard SSL/TLS related `SSL_*' environment variables.
-# Per default this exportation is switched off for performance reasons,
-# because the extraction step is an expensive operation and is usually
-# useless for serving static content. So one usually enables the
-# exportation for CGI and SSI requests only.
-# o StrictRequire:
-# This denies access when "SSLRequireSSL" or "SSLRequire" applied even
-# under a "Satisfy any" situation, i.e. when it applies access is denied
-# and no other module can change it.
-# o OptRenegotiate:
-# This enables optimized SSL connection renegotiation handling when SSL
-# directives are used in per-directory context.
-#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
-<Files ~ "\.(cgi|shtml|phtml|php3?)$">
- SSLOptions +StdEnvVars
-</Files>
-<Directory "/var/www/cgi-bin">
- SSLOptions +StdEnvVars
-</Directory>
-
-# SSL Protocol Adjustments:
-# The safe and default but still SSL/TLS standard compliant shutdown
-# approach is that mod_ssl sends the close notify alert but doesn't wait for
-# the close notify alert from client. When you need a different shutdown
-# approach you can use one of the following variables:
-# o ssl-unclean-shutdown:
-# This forces an unclean shutdown when the connection is closed, i.e. no
-# SSL close notify alert is send or allowed to received. This violates
-# the SSL/TLS standard but is needed for some brain-dead browsers. Use
-# this when you receive I/O errors because of the standard approach where
-# mod_ssl sends the close notify alert.
-# o ssl-accurate-shutdown:
-# This forces an accurate shutdown when the connection is closed, i.e. a
-# SSL close notify alert is send and mod_ssl waits for the close notify
-# alert of the client. This is 100% SSL/TLS standard compliant, but in
-# practice often causes hanging connections with brain-dead browsers. Use
-# this only for browsers where you know that their SSL implementation
-# works correctly.
-# Notice: Most problems of broken clients are also related to the HTTP
-# keep-alive facility, so you usually additionally want to disable
-# keep-alive for those clients, too. Use variable "nokeepalive" for this.
-# Similarly, one has to force some clients to use HTTP/1.0 to workaround
-# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
-# "force-response-1.0" for this.
-BrowserMatch "MSIE [2-5]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
-
-# Per-Server Logging:
-# The home of a custom SSL log file. Use this when you want a
-# compact non-error SSL logfile on a virtual host basis.
-CustomLog logs/ssl_request_log \
- "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/2265cbe6/dev-tools/ansible/roles/pga/files/ssl.conf
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/files/ssl.conf b/dev-tools/ansible/roles/pga/files/ssl.conf
new file mode 100644
index 0000000..6e84cf4
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/files/ssl.conf
@@ -0,0 +1,217 @@
+#
+# When we also provide SSL we have to listen to the
+# the HTTPS port in addition.
+#
+Listen 443 https
+
+##
+## SSL Global Context
+##
+## All SSL configuration in this context applies both to
+## the main server and all SSL-enabled virtual hosts.
+##
+
+# Pass Phrase Dialog:
+# Configure the pass phrase gathering process.
+# The filtering dialog program (`builtin' is a internal
+# terminal dialog) has to provide the pass phrase on stdout.
+SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
+
+# Inter-Process Session Cache:
+# Configure the SSL Session Cache: First the mechanism
+# to use and second the expiring timeout (in seconds).
+SSLSessionCache shmcb:/run/httpd/sslcache(512000)
+SSLSessionCacheTimeout 300
+
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the
+# SSL library. The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. This means you then cannot use the /dev/random device
+# because it would lead to very long connection times (as long as
+# it requires to make more entropy available). But usually those
+# platforms additionally provide a /dev/urandom device which doesn't
+# block. So, if available, use this one instead. Read the mod_ssl User
+# Manual for more details.
+SSLRandomSeed startup file:/dev/urandom 256
+SSLRandomSeed connect builtin
+#SSLRandomSeed startup file:/dev/random 512
+#SSLRandomSeed connect file:/dev/random 512
+#SSLRandomSeed connect file:/dev/urandom 512
+
+#
+# Use "SSLCryptoDevice" to enable any supported hardware
+# accelerators. Use "openssl engine -v" to list supported
+# engine names. NOTE: If you enable an accelerator and the
+# server does not start, consult the error logs and ensure
+# your accelerator is functioning properly.
+#
+SSLCryptoDevice builtin
+#SSLCryptoDevice ubsec
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:443>
+
+# General setup for the virtual host, inherited from global configuration
+#DocumentRoot "/var/www/html"
+#ServerName www.example.com:443
+
+# Use separate log files for the SSL virtual host; note that LogLevel
+# is not inherited from httpd.conf.
+ErrorLog logs/ssl_error_log
+TransferLog logs/ssl_access_log
+LogLevel warn
+
+# SSL Engine Switch:
+# Enable/Disable SSL for this virtual host.
+SSLEngine on
+
+# SSL Protocol support:
+# List the enable protocol levels with which clients will be able to
+# connect. Disable SSLv2 access by default:
+# Disable SSLv3 which is vulnerable to the POODLE attack
+SSLProtocol All -SSLv2 -SSLv3
+
+# SSL Cipher Suite:
+# List the ciphers that the client is permitted to negotiate.
+# See the mod_ssl documentation for a complete list.
+SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!SEED:!IDEA
+
+# Speed-optimized SSL Cipher configuration:
+# If speed is your main concern (on busy HTTPS servers e.g.),
+# you might want to force clients to specific, performance
+# optimized ciphers. In this case, prepend those ciphers
+# to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
+# Caveat: by giving precedence to RC4-SHA and AES128-SHA
+# (as in the example below), most connections will no longer
+# have perfect forward secrecy - if the server's key is
+# compromised, captures of past or future traffic must be
+# considered compromised, too.
+#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
+#SSLHonorCipherOrder on
+
+# Server Certificate:
+# Point SSLCertificateFile at a PEM encoded certificate. If
+# the certificate is encrypted, then you will be prompted for a
+# pass phrase. Note that a kill -HUP will prompt again. A new
+# certificate can be generated using the genkey(1) command.
+SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+
+# Server Private Key:
+# If the key is not combined with the certificate, use this
+# directive to point at the key file. Keep in mind that if
+# you've both a RSA and a DSA private key you can configure
+# both in parallel (to also allow the use of DSA ciphers, etc.)
+SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+
+# Server Certificate Chain:
+# Point SSLCertificateChainFile at a file containing the
+# concatenation of PEM encoded CA certificates which form the
+# certificate chain for the server certificate. Alternatively
+# the referenced file can be the same as SSLCertificateFile
+# when the CA certificates are directly appended to the server
+# certificate for convinience.
+#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
+
+# Certificate Authority (CA):
+# Set the CA certificate verification path where to find CA
+# certificates for client authentication or alternatively one
+# huge file containing all of them (file must be PEM encoded)
+#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
+
+# Client Authentication (Type):
+# Client certificate verification type and depth. Types are
+# none, optional, require and optional_no_ca. Depth is a
+# number which specifies how deeply to verify the certificate
+# issuer chain before deciding the certificate is not valid.
+#SSLVerifyClient require
+#SSLVerifyDepth 10
+
+# Access Control:
+# With SSLRequire you can do per-directory access control based
+# on arbitrary complex boolean expressions containing server
+# variable checks and other lookup directives. The syntax is a
+# mixture between C and Perl. See the mod_ssl documentation
+# for more details.
+#<Location />
+#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
+# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+# SSL Engine Options:
+# Set various options for the SSL engine.
+# o FakeBasicAuth:
+# Translate the client X.509 into a Basic Authorisation. This means that
+# the standard Auth/DBMAuth methods can be used for access control. The
+# user name is the `one line' version of the client's X.509 certificate.
+# Note that no password is obtained from the user. Every entry in the user
+# file needs this password: `xxj31ZMTZzkVA'.
+# o ExportCertData:
+# This exports two additional environment variables: SSL_CLIENT_CERT and
+# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+# server (always existing) and the client (only existing when client
+# authentication is used). This can be used to import the certificates
+# into CGI scripts.
+# o StdEnvVars:
+# This exports the standard SSL/TLS related `SSL_*' environment variables.
+# Per default this exportation is switched off for performance reasons,
+# because the extraction step is an expensive operation and is usually
+# useless for serving static content. So one usually enables the
+# exportation for CGI and SSI requests only.
+# o StrictRequire:
+# This denies access when "SSLRequireSSL" or "SSLRequire" applied even
+# under a "Satisfy any" situation, i.e. when it applies access is denied
+# and no other module can change it.
+# o OptRenegotiate:
+# This enables optimized SSL connection renegotiation handling when SSL
+# directives are used in per-directory context.
+#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+ SSLOptions +StdEnvVars
+</Files>
+<Directory "/var/www/cgi-bin">
+ SSLOptions +StdEnvVars
+</Directory>
+
+# SSL Protocol Adjustments:
+# The safe and default but still SSL/TLS standard compliant shutdown
+# approach is that mod_ssl sends the close notify alert but doesn't wait for
+# the close notify alert from client. When you need a different shutdown
+# approach you can use one of the following variables:
+# o ssl-unclean-shutdown:
+# This forces an unclean shutdown when the connection is closed, i.e. no
+# SSL close notify alert is send or allowed to received. This violates
+# the SSL/TLS standard but is needed for some brain-dead browsers. Use
+# this when you receive I/O errors because of the standard approach where
+# mod_ssl sends the close notify alert.
+# o ssl-accurate-shutdown:
+# This forces an accurate shutdown when the connection is closed, i.e. a
+# SSL close notify alert is send and mod_ssl waits for the close notify
+# alert of the client. This is 100% SSL/TLS standard compliant, but in
+# practice often causes hanging connections with brain-dead browsers. Use
+# this only for browsers where you know that their SSL implementation
+# works correctly.
+# Notice: Most problems of broken clients are also related to the HTTP
+# keep-alive facility, so you usually additionally want to disable
+# keep-alive for those clients, too. Use variable "nokeepalive" for this.
+# Similarly, one has to force some clients to use HTTP/1.0 to workaround
+# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+# "force-response-1.0" for this.
+BrowserMatch "MSIE [2-5]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+
+# Per-Server Logging:
+# The home of a custom SSL log file. Use this when you want a
+# compact non-error SSL logfile on a virtual host basis.
+CustomLog logs/ssl_request_log \
+ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/2265cbe6/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 0ea5d63..f510b70 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -147,6 +147,14 @@
notify:
- restart httpd
+- name: copy modified ssl.conf file
+ copy: src=ssl.conf dest={{ ssl_conf_file_location[ansible_os_family] }} backup=yes
+ become: yes
+ notify:
+ - restart httpd
+ # TODO: make the same fix (disabling SSLv3) on Debian systems too
+ when: ansible_os_family == "RedHat"
+
- name: copy pga user's SSH key for the gateway data store
authorized_key:
user: "{{user}}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/2265cbe6/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
index b55697d..19345e5 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
@@ -23,6 +23,8 @@
ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
SSLEngine on
+ # Disable SSLv3 which is vulnerable to the POODLE attack
+ SSLProtocol All -SSLv2 -SSLv3
SSLCertificateFile {{ ssl_certificate_file }}
SSLCertificateChainFile {{ ssl_certificate_chain_file }}
SSLCertificateKeyFile {{ ssl_certificate_key_file }}
[09/13] airavata git commit: Instructions on how to install ansible
in virtual environment
Posted by ma...@apache.org.
Instructions on how to install ansible in virtual environment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/317bece9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/317bece9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/317bece9
Branch: refs/heads/develop
Commit: 317bece97ae162e797eda1b3ce3d63535ae6a5a8
Parents: 2265cbe
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue May 9 10:39:32 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue May 9 10:39:32 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/.gitignore | 1 +
dev-tools/ansible/README.md | 21 +++++++++++++++++++++
dev-tools/ansible/requirements.txt | 1 +
3 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/317bece9/dev-tools/ansible/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/.gitignore b/dev-tools/ansible/.gitignore
index 982f5b2..9fe8344 100644
--- a/dev-tools/ansible/.gitignore
+++ b/dev-tools/ansible/.gitignore
@@ -1,2 +1,3 @@
*.retry
vault-password.txt
+ENV/
http://git-wip-us.apache.org/repos/asf/airavata/blob/317bece9/dev-tools/ansible/README.md
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/README.md b/dev-tools/ansible/README.md
index f2b8a6c..f5213a9 100644
--- a/dev-tools/ansible/README.md
+++ b/dev-tools/ansible/README.md
@@ -3,6 +3,27 @@
Ansible script to deploy Apache Airavata and PGA.
There are ansible roles to install Airavata pre-requisites (RabbitMQ, Zookeeper, MariaDB).
+## Ansible installation
+
+Note: the following assumes a Bash shell.
+
+1. Download and install the latest version of Python 3.6. See
+ https://www.python.org/downloads/ or use your system's package manager.
+2. Create a virtual environment in this directory
+
+ cd airavata/dev-tools/ansible
+ python3.6 -m venv ENV
+
+3. Source the environment (you'll need to do this each time before using ansible commands)
+
+ source ENV/bin/activate
+
+4. Install ansible and any other dependencies.
+
+ pip install -r requirements.txt
+
+Now you should be ready to run `ansible-playbook` and other ansible commands.
+
## Supported OS with versions.
- Centos 7
http://git-wip-us.apache.org/repos/asf/airavata/blob/317bece9/dev-tools/ansible/requirements.txt
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/requirements.txt b/dev-tools/ansible/requirements.txt
new file mode 100644
index 0000000..6f15c81
--- /dev/null
+++ b/dev-tools/ansible/requirements.txt
@@ -0,0 +1 @@
+ansible==2.2.1.0
[10/13] airavata git commit: Merge branch 'lsf-walltime'
Posted by ma...@apache.org.
Merge branch 'lsf-walltime'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8310de56
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8310de56
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8310de56
Branch: refs/heads/develop
Commit: 8310de563407a285da5c309585c30fe07416671d
Parents: 317bece 7b48f15
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 9 13:30:38 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 9 13:30:38 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/core/GFacUtils.java | 8 +++++++-
.../org/apache/airavata/gfac/core/cluster/OutputParser.java | 2 +-
.../org/apache/airavata/gfac/impl/job/LSFOutputParser.java | 6 +++++-
3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[07/13] airavata git commit: Copied ssl.conf from mod_ssl v 2.4.6,
release 45.el7.centos.4
Posted by ma...@apache.org.
Copied ssl.conf from mod_ssl v 2.4.6, release 45.el7.centos.4
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3a82e021
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3a82e021
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3a82e021
Branch: refs/heads/develop
Commit: 3a82e021965edb5461d48d6e3d619dee86d9d9bd
Parents: a76825c
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed May 3 17:01:48 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed May 3 17:20:38 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/pga/defaults/ssl.conf | 216 +++++++++++++++++++++
1 file changed, 216 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3a82e021/dev-tools/ansible/roles/pga/defaults/ssl.conf
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/ssl.conf b/dev-tools/ansible/roles/pga/defaults/ssl.conf
new file mode 100644
index 0000000..b598990
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/defaults/ssl.conf
@@ -0,0 +1,216 @@
+#
+# When we also provide SSL we have to listen to the
+# the HTTPS port in addition.
+#
+Listen 443 https
+
+##
+## SSL Global Context
+##
+## All SSL configuration in this context applies both to
+## the main server and all SSL-enabled virtual hosts.
+##
+
+# Pass Phrase Dialog:
+# Configure the pass phrase gathering process.
+# The filtering dialog program (`builtin' is a internal
+# terminal dialog) has to provide the pass phrase on stdout.
+SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
+
+# Inter-Process Session Cache:
+# Configure the SSL Session Cache: First the mechanism
+# to use and second the expiring timeout (in seconds).
+SSLSessionCache shmcb:/run/httpd/sslcache(512000)
+SSLSessionCacheTimeout 300
+
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the
+# SSL library. The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. This means you then cannot use the /dev/random device
+# because it would lead to very long connection times (as long as
+# it requires to make more entropy available). But usually those
+# platforms additionally provide a /dev/urandom device which doesn't
+# block. So, if available, use this one instead. Read the mod_ssl User
+# Manual for more details.
+SSLRandomSeed startup file:/dev/urandom 256
+SSLRandomSeed connect builtin
+#SSLRandomSeed startup file:/dev/random 512
+#SSLRandomSeed connect file:/dev/random 512
+#SSLRandomSeed connect file:/dev/urandom 512
+
+#
+# Use "SSLCryptoDevice" to enable any supported hardware
+# accelerators. Use "openssl engine -v" to list supported
+# engine names. NOTE: If you enable an accelerator and the
+# server does not start, consult the error logs and ensure
+# your accelerator is functioning properly.
+#
+SSLCryptoDevice builtin
+#SSLCryptoDevice ubsec
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:443>
+
+# General setup for the virtual host, inherited from global configuration
+#DocumentRoot "/var/www/html"
+#ServerName www.example.com:443
+
+# Use separate log files for the SSL virtual host; note that LogLevel
+# is not inherited from httpd.conf.
+ErrorLog logs/ssl_error_log
+TransferLog logs/ssl_access_log
+LogLevel warn
+
+# SSL Engine Switch:
+# Enable/Disable SSL for this virtual host.
+SSLEngine on
+
+# SSL Protocol support:
+# List the enable protocol levels with which clients will be able to
+# connect. Disable SSLv2 access by default:
+SSLProtocol all -SSLv2
+
+# SSL Cipher Suite:
+# List the ciphers that the client is permitted to negotiate.
+# See the mod_ssl documentation for a complete list.
+SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!SEED:!IDEA
+
+# Speed-optimized SSL Cipher configuration:
+# If speed is your main concern (on busy HTTPS servers e.g.),
+# you might want to force clients to specific, performance
+# optimized ciphers. In this case, prepend those ciphers
+# to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
+# Caveat: by giving precedence to RC4-SHA and AES128-SHA
+# (as in the example below), most connections will no longer
+# have perfect forward secrecy - if the server's key is
+# compromised, captures of past or future traffic must be
+# considered compromised, too.
+#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
+#SSLHonorCipherOrder on
+
+# Server Certificate:
+# Point SSLCertificateFile at a PEM encoded certificate. If
+# the certificate is encrypted, then you will be prompted for a
+# pass phrase. Note that a kill -HUP will prompt again. A new
+# certificate can be generated using the genkey(1) command.
+SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+
+# Server Private Key:
+# If the key is not combined with the certificate, use this
+# directive to point at the key file. Keep in mind that if
+# you've both a RSA and a DSA private key you can configure
+# both in parallel (to also allow the use of DSA ciphers, etc.)
+SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+
+# Server Certificate Chain:
+# Point SSLCertificateChainFile at a file containing the
+# concatenation of PEM encoded CA certificates which form the
+# certificate chain for the server certificate. Alternatively
+# the referenced file can be the same as SSLCertificateFile
+# when the CA certificates are directly appended to the server
+# certificate for convinience.
+#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
+
+# Certificate Authority (CA):
+# Set the CA certificate verification path where to find CA
+# certificates for client authentication or alternatively one
+# huge file containing all of them (file must be PEM encoded)
+#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
+
+# Client Authentication (Type):
+# Client certificate verification type and depth. Types are
+# none, optional, require and optional_no_ca. Depth is a
+# number which specifies how deeply to verify the certificate
+# issuer chain before deciding the certificate is not valid.
+#SSLVerifyClient require
+#SSLVerifyDepth 10
+
+# Access Control:
+# With SSLRequire you can do per-directory access control based
+# on arbitrary complex boolean expressions containing server
+# variable checks and other lookup directives. The syntax is a
+# mixture between C and Perl. See the mod_ssl documentation
+# for more details.
+#<Location />
+#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
+# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+# SSL Engine Options:
+# Set various options for the SSL engine.
+# o FakeBasicAuth:
+# Translate the client X.509 into a Basic Authorisation. This means that
+# the standard Auth/DBMAuth methods can be used for access control. The
+# user name is the `one line' version of the client's X.509 certificate.
+# Note that no password is obtained from the user. Every entry in the user
+# file needs this password: `xxj31ZMTZzkVA'.
+# o ExportCertData:
+# This exports two additional environment variables: SSL_CLIENT_CERT and
+# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+# server (always existing) and the client (only existing when client
+# authentication is used). This can be used to import the certificates
+# into CGI scripts.
+# o StdEnvVars:
+# This exports the standard SSL/TLS related `SSL_*' environment variables.
+# Per default this exportation is switched off for performance reasons,
+# because the extraction step is an expensive operation and is usually
+# useless for serving static content. So one usually enables the
+# exportation for CGI and SSI requests only.
+# o StrictRequire:
+# This denies access when "SSLRequireSSL" or "SSLRequire" applied even
+# under a "Satisfy any" situation, i.e. when it applies access is denied
+# and no other module can change it.
+# o OptRenegotiate:
+# This enables optimized SSL connection renegotiation handling when SSL
+# directives are used in per-directory context.
+#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+ SSLOptions +StdEnvVars
+</Files>
+<Directory "/var/www/cgi-bin">
+ SSLOptions +StdEnvVars
+</Directory>
+
+# SSL Protocol Adjustments:
+# The safe and default but still SSL/TLS standard compliant shutdown
+# approach is that mod_ssl sends the close notify alert but doesn't wait for
+# the close notify alert from client. When you need a different shutdown
+# approach you can use one of the following variables:
+# o ssl-unclean-shutdown:
+# This forces an unclean shutdown when the connection is closed, i.e. no
+# SSL close notify alert is send or allowed to received. This violates
+# the SSL/TLS standard but is needed for some brain-dead browsers. Use
+# this when you receive I/O errors because of the standard approach where
+# mod_ssl sends the close notify alert.
+# o ssl-accurate-shutdown:
+# This forces an accurate shutdown when the connection is closed, i.e. a
+# SSL close notify alert is send and mod_ssl waits for the close notify
+# alert of the client. This is 100% SSL/TLS standard compliant, but in
+# practice often causes hanging connections with brain-dead browsers. Use
+# this only for browsers where you know that their SSL implementation
+# works correctly.
+# Notice: Most problems of broken clients are also related to the HTTP
+# keep-alive facility, so you usually additionally want to disable
+# keep-alive for those clients, too. Use variable "nokeepalive" for this.
+# Similarly, one has to force some clients to use HTTP/1.0 to workaround
+# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+# "force-response-1.0" for this.
+BrowserMatch "MSIE [2-5]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+
+# Per-Server Logging:
+# The home of a custom SSL log file. Use this when you want a
+# compact non-error SSL logfile on a virtual host basis.
+CustomLog logs/ssl_request_log \
+ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>
[11/13] airavata git commit: adding nanoconfinement to gateway
deployment
Posted by ma...@apache.org.
adding nanoconfinement to gateway deployment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e65d9d73
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e65d9d73
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e65d9d73
Branch: refs/heads/develop
Commit: e65d9d7362b9d3c54b22c5839ede2f18ec0f15de
Parents: 8310de5
Author: Suresh Marru <sm...@apache.org>
Authored: Thu May 11 12:48:44 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu May 11 12:48:44 2017 -0400
----------------------------------------------------------------------
.../pga_config/nanoconfinement/vars.yml | 55 ++++++++++++++++++++
.../pga_config/nanoconfinement/vault.yml | 18 +++++++
dev-tools/ansible/pga-scigap-prod.yml | 1 +
3 files changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e65d9d73/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
new file mode 100644
index 0000000..c7c360c
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
@@ -0,0 +1,55 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/nanoconfinement"
+vhost_servername: "nanoconfinement.jadhaolab.indiana.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/nanoconfinement.jadhaolab.indiana.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/nanoconfinement.jadhaolab.indiana.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/nanoconfinement.jadhaolab.indiana.edu/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.nanoconfinement"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "nanoconfinement"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/nanoconfinement"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "nanoconfinement-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/nanoconfinement-gateway-theme.git"
+portal_title: "Nano Confinement Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/e65d9d73/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
new file mode 100644
index 0000000..7071d8e
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+34363533353931356538613438326265666432366334616634333166393232616539333934613363
+3132303138613337616461653639396235316266396338650a393934323837393230666632366635
+62633238613832663533303334656463306461653232363430653462613135313734636130316161
+6132303237386135640a643366386465323662336238326630633665306664623361343335633335
+32373232303335633733333439623239646431646663633239633965373838613933663466653032
+35396632323265633634363562383962666430663331363436386364363161313436343861386531
+32373936323364616238366563616165353964653065653463666563656633376632623039373661
+64346633643433383535633130623730383238306432353138353265393666353261306539663936
+30303433643661303839633062323639326234336137643331653664393432313736653838373365
+36613762353461333234356263653363626334656232656265353962316333326132356539373239
+66373734316365613136616337653861386139343832316132363566656636396531376163366263
+36303936643134613230313132326539646664383062393161646230393937613864353138326638
+31306133326331343236316335646261373138353638333564393238333765646138616131353738
+31613531323534663963643131363434366163326530353565323737613136313333333166386561
+30626633666365646131336232323837653566666338653330666633653436353562316434363363
+39336639383835356230616630323036303364316433373666353465633631633033633634376239
+3639
http://git-wip-us.apache.org/repos/asf/airavata/blob/e65d9d73/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index bc923a4..3bfeead 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -24,6 +24,7 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
[03/13] airavata git commit: Removing dREG config for gf4 deploy;
it's now on Jetstream
Posted by ma...@apache.org.
Removing dREG config for gf4 deploy; it's now on Jetstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/868fc558
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/868fc558
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/868fc558
Branch: refs/heads/develop
Commit: 868fc55811bea98c849b682fd687c062f71e3dc5
Parents: a61aab4
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed May 3 11:56:38 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed May 3 11:56:38 2017 -0400
----------------------------------------------------------------------
.../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 ----------
.../pga_config/cornell-dnasequence/vars.yml | 63 --------------------
.../pga_config/cornell-dnasequence/vault.yml | 18 ------
dev-tools/ansible/pga-scigap-prod.yml | 1 -
4 files changed, 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/868fc558/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2
deleted file mode 100644
index ee053cc..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-<VirtualHost *:80>
- ServerName {{ vhost_servername }}
- {% if vhost_serveralias is defined %}
- ServerAlias {{ vhost_serveralias }}
- {% endif %}
-
- ## Redirect all http traffic to https
- RewriteEngine On
- RewriteCond %{HTTPS} off
- # Don't redirect /gbrowser and /gbfile requests to HTTPS
- RewriteCond %{THE_REQUEST} !\s/(gbrowser|gbfile)
- RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
-</VirtualHost>
-
-<VirtualHost *:443>
- ServerName {{ vhost_servername }}
- {% if vhost_serveralias is defined %}
- ServerAlias {{ vhost_serveralias }}
- {% endif %}
-
- DocumentRoot {{ doc_root_dir }}/public
- <Directory "{{ doc_root_dir }}/public">
- AllowOverride All
- </Directory>
- ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
- CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
- SSLEngine on
- SSLCertificateFile {{ ssl_certificate_file }}
- SSLCertificateChainFile {{ ssl_certificate_chain_file }}
- SSLCertificateKeyFile {{ ssl_certificate_key_file }}
-</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/868fc558/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml
deleted file mode 100644
index 56cc201..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-#
-# 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.
-#
-
----
-
-# FIXME Temporarily dREG is pointed to gw56 (dev)
-airavata_server: "tls://gw56.iu.xsede.org"
-airavata_port: "9930"
-
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "dreg-gateway"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "dreg.dnasequence.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/dreg.dnasequence.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dreg.dnasequence.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dreg.dnasequence.org/privkey.pem"
-pga_ssl_vhost_template: "{{ inventory_dir }}/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2"
-
-## WSO2 IS related variables
-tenant_domain: "dreg.cornell"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-# dREG gateway automatically gives users the gateway-user role so they don't have to wait on admin approval
-initial_role_name: "gateway-user"
-
-gateway_id: "cornelldna"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/cornell-dnasequence"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTs6k2lSt5nn+UF3N1rAko9WjdtHZ1xLcKxCG4+4AVMdTIeng12g+1qB5hIFiDgesT/D/nzoA27EFj5nWiYanxBySNgl1Re8kR0nEqQbR0zj1dSibmfjW+vmOZzEiNSrNoLlc4KbFgqFCRGIlZ1bWZ7yHtJ3I7xxfKhvvxCTzJ4K71v1aovnDTUYophy2lUsdOcOq84Qhv3ITZafgblz3mJSwVpnnI72IepzonzDUdcf/w0lKCl70L9MgQAZ2V4e9sQZWJLI5s1VtJsqKggtgI4goPyxXROoH9PTUZFqvvYjLGW8JVS9eZKblSKil09yckPfZCSk1i/UD/uY6O7bjf"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['zw355@cornell.edu','sgg@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-# The portal theme is included in the dreg-gateway branch of airavata-php-gateway
-portal_theme: "dreg"
-portal_title: "dREG DNA Sequencing"
-...
http://git-wip-us.apache.org/repos/asf/airavata/blob/868fc558/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml
deleted file mode 100644
index eaca63b..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-37653231363231666433316261313238643763633234663866393832386236643436623566303263
-3334323065363831656435383564623034393661323037300a343263316666633131366134613661
-39633030386362623966303630653462373762373034323134356539313036376563613335383135
-3962646533323362370a383064616634303730373232353663386165313666303732396635643562
-39313037323264656236323337643862636265626138656435303064353531616264633435643965
-38616138613039336666313436643635666337643533343264326637653864356563343532333262
-35323335336437333964373366653737343032306238643032343162353437666664376636353236
-32363138633432396330613832656266663734616131383735393565343133626666313766313164
-35386534313033623563613635343163633564613636636236316633623263313437626337663530
-64313166323263353266623135616236653463356439363530373630653232363863303238356265
-65363630393364636238643861386161356635666331336530626533666434373931393237643861
-33383663653439313064393735653064323836656666343366636161643938396136383234386232
-33343238636238373936663365316663653532616364636336363936316235353164636365613738
-33346462386230623735376132306663633932363838643935373539316565626435646565393833
-66623065373162623964363665646436356464643366633764323232343736353032616561643637
-30326166396262316335323463323763653930653263613162663336343863313937393934313765
-30626235653162643566366361303630616437346539333436616666313738346232
http://git-wip-us.apache.org/repos/asf/airavata/blob/868fc558/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 4f4d099..bc923a4 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -21,7 +21,6 @@
---
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cinetvtech"
-# - include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cornell-dnasequence"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
[12/13] airavata git commit: Updated Oracle JDK url
Posted by ma...@apache.org.
Updated Oracle JDK url
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f6f2adc5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f6f2adc5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f6f2adc5
Branch: refs/heads/develop
Commit: f6f2adc5aaf93cec7f64850be0dcc4aecc6c4aeb
Parents: e65d9d7
Author: Marcus Christie <ma...@apache.org>
Authored: Mon May 22 16:05:16 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon May 22 16:05:16 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/java/vars/main.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f6f2adc5/dev-tools/ansible/roles/java/vars/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/java/vars/main.yml b/dev-tools/ansible/roles/java/vars/main.yml
index f325d21..10026c3 100644
--- a/dev-tools/ansible/roles/java/vars/main.yml
+++ b/dev-tools/ansible/roles/java/vars/main.yml
@@ -24,12 +24,14 @@
java_dir_source: "/usr/local/src"
java_version: 8
-java_version_update: 91
-java_version_build: '14'
+java_version_update: 131
+java_version_build: '11'
java_version_string: "1.{{ java_version }}.0_{{ java_version_update }}"
java_home: "/usr/java/jdk1.{{ java_version }}.0_{{ java_version_update }}"
java_rpm_filename: "jdk-{{ java_version }}u{{ java_version_update }}-linux-x64.rpm"
-java_rpm_url: "http://download.oracle.com/otn-pub/java/jdk/{{ java_version }}u{{ java_version_update }}-b{{ java_version_build }}/{{ java_rpm_filename }}"
+#java_rpm_url: "http://download.oracle.com/otn/java/jdk/{{ java_version }}u{{ java_version_update }}-b{{ java_version_build }}/{{ java_rpm_filename }}"
+# Format of URL changed, just hardcoding it here
+java_rpm_url: "http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm"
...
[05/13] airavata git commit: fixing bug in parentPath dir
Posted by ma...@apache.org.
fixing bug in parentPath dir
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/010b133a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/010b133a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/010b133a
Branch: refs/heads/develop
Commit: 010b133a251c637297305d12462cac8b8e229087
Parents: 1108b57
Author: scnakandala <su...@gmail.com>
Authored: Wed May 3 16:57:37 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed May 3 17:19:25 2017 -0400
----------------------------------------------------------------------
.../gfac/impl/task/SCPDataStageTask.java | 28 ++++++++++++--------
1 file changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/010b133a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index 9a42124..e7451c4 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -138,15 +138,6 @@ public class SCPDataStageTask implements Task {
ServerInfo serverInfo = processContext.getComputeResourceServerInfo();
Session sshSession = Factory.getSSHSession(authenticationInfo, serverInfo);
- //Wildcard for file name. Has to find the correct name.
- if(fileName.startsWith("*.")){
- String temp = taskContext.getParentProcessContext().getDataMovementRemoteCluster()
- .getFileNameFromExtension(fileName.substring(2), inputPath, sshSession);
- if(temp != null && temp != ""){
- fileName = temp;
- }
- }
-
URI destinationURI = null;
if (subTaskModel.getDestination().startsWith("dummy")) {
destinationURI = TaskUtils.getDestinationURI(taskContext, hostName, inputPath, fileName);
@@ -163,11 +154,26 @@ public class SCPDataStageTask implements Task {
return status;
}
-
status = new TaskStatus(TaskState.COMPLETED);
+ //Wildcard for file name. Has to find the correct name.
+ if(fileName.startsWith("*.")){
+ String destParentPath = (new File(destinationURI.getPath())).getParentFile().getPath();
+ String temp = taskContext.getParentProcessContext().getDataMovementRemoteCluster()
+ .getFileNameFromExtension(fileName.substring(2), destParentPath, sshSession);
+ if(temp != null && temp != ""){
+ fileName = temp;
+ }
+ if(destParentPath.endsWith(File.separator)){
+ destinationURI = new URI(destParentPath + fileName);
+ }else{
+ destinationURI = new URI(destParentPath + File.separator + fileName);
+ }
+
+ }
+
if (processState == ProcessState.INPUT_DATA_STAGING) {
- inputDataStaging(taskContext, sshSession, sourceURI, destinationURI);
+ inputDataStaging(taskContext, sshSession, sourceURI, destinationURI);
status.setReason("Successfully staged input data");
} else if (processState == ProcessState.OUTPUT_DATA_STAGING) {
makeDir(taskContext, destinationURI);
[13/13] airavata git commit: Merge branch 'master' into develop
Posted by ma...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/701f36a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/701f36a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/701f36a7
Branch: refs/heads/develop
Commit: 701f36a7a138753ae944a63a2f11b8f89825a3c9
Parents: f19cc0c f6f2adc
Author: Marcus Christie <ma...@apache.org>
Authored: Mon May 22 16:08:48 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon May 22 16:08:48 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/.gitignore | 1 +
dev-tools/ansible/README.md | 21 ++
.../dreg-production/files/pga-ssl-vhost.conf.j2 | 2 +
.../dreg-production/group_vars/pga/vars.yml | 2 +-
.../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 ---
.../pga_config/cornell-dnasequence/vars.yml | 63 ------
.../pga_config/cornell-dnasequence/vault.yml | 18 --
.../pga_config/nanoconfinement/vars.yml | 55 +++++
.../pga_config/nanoconfinement/vault.yml | 18 ++
.../production/pga_config/ultrascan/vars.yml | 5 +-
dev-tools/ansible/pga-scigap-prod.yml | 2 +-
dev-tools/ansible/requirements.txt | 1 +
dev-tools/ansible/roles/java/vars/main.yml | 8 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 4 +
dev-tools/ansible/roles/pga/files/ssl.conf | 217 +++++++++++++++++++
dev-tools/ansible/roles/pga/tasks/main.yml | 8 +
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 2 +
17 files changed, 338 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/701f36a7/dev-tools/ansible/README.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/701f36a7/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
[06/13] airavata git commit: fixing bug in parentPath dir
Posted by ma...@apache.org.
fixing bug in parentPath dir
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a76825ca
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a76825ca
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a76825ca
Branch: refs/heads/develop
Commit: a76825caf5d89b836e2f9e049f295fd45766d6e5
Parents: 010b133
Author: scnakandala <su...@gmail.com>
Authored: Wed May 3 17:05:03 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed May 3 17:19:34 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a76825ca/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index e7451c4..138f4d9 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -159,8 +159,9 @@ public class SCPDataStageTask implements Task {
//Wildcard for file name. Has to find the correct name.
if(fileName.startsWith("*.")){
String destParentPath = (new File(destinationURI.getPath())).getParentFile().getPath();
+ String sourceParentPath = (new File(sourceURI.getPath())).getParentFile().getPath();
String temp = taskContext.getParentProcessContext().getDataMovementRemoteCluster()
- .getFileNameFromExtension(fileName.substring(2), destParentPath, sshSession);
+ .getFileNameFromExtension(fileName.substring(2), sourceParentPath, sshSession);
if(temp != null && temp != ""){
fileName = temp;
}
[02/13] airavata git commit: Updating Ultrascan data store resource
id and ssh key
Posted by ma...@apache.org.
Updating Ultrascan data store resource id and ssh key
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a61aab42
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a61aab42
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a61aab42
Branch: refs/heads/develop
Commit: a61aab4236bffe15d0a2e740407173f47bb57638
Parents: 64b5570
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed May 3 11:53:06 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed May 3 11:53:06 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/ultrascan/vars.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a61aab42/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index 491b491..3110a94 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -48,9 +48,8 @@ user_role_name: "airavata-user"
gateway_id: "Ultrascan_Production"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/ultrascan"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-# Not using gateway storage right now
-#gateway_data_store_ssh_public_key: ""
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_5ef8ddd3-2a2a-48ca-9c5f-becce690c6c1"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCHxpxod4TZ9Iy0TyqEK1uyKEeq41QRUlD9sHZmuF3aeXpbnleOW1F8NQrpUuzCrcT+xb8Owam8rCB3xe73ZWzf4BJBjt8MJ481kGgufZzzIAuTHcewEzjoabTrg+3b8eQsq9uWyJc96/SEzKlryOkyZL6MptCE8kbcquD/Jo6ADMpAAS9rDmSaWg5dPbITrF2o2r1cHKeHkri45b6+ih63Mf/pYhbHTPsheaQu3Kyk1YmdP25pgzD65SMZSeZan8St4mPDdGMOwfvjIkhvoyPXoyaCqTwnQ3bfwlL/xmbxtGWPax73pgitlhtKynRRWgse8uc6rIQxzXsKkAHbB/R3"
data_sharing_enabled: "false"