Merge branch 'develop' of https://github.com/parklab/refinery-platform …

…into develop

deployment/aws-config/10default.yaml

@@ -35,10 +35,14 @@
 
 # The name of the pre-existing RDS instance to connect to.
 # (must use the PostgreSQL engine)
-# RDS_SUPERUSER_NAME: "rds-refinery"
+# RDS_NAME: "rds-refinery"
 
 # The name of the RDS superuser account.
+# RDS_SUPERUSER_NAME:
 # FIXED to "root"
 
 # The password for the RDS superuser account.
 # RDS_SUPERUSER_PASSWORD: "mypassword"
+
+# The name of the PostgreSQL role to create.
+RDS_ROLE: "refinery"

deployment/aws.sh

@@ -27,9 +27,14 @@ cd /srv/refinery-platform/deployment
 
 # Discover IP endpoint for our PostgreSQL RDS, and place it in
 # environment variables for puppet/facter to use
-bin/aws-rds-endpoint db20160111 > /home/ubuntu/rds
+: ${RDS_NAME?RDS_NAME must be set}
+bin/aws-rds-endpoint "$RDS_NAME" > /home/ubuntu/rds
+
+# FACTER environment variables become facts for puppet;
+# see https://puppetlabs.com/blog/facter-part-1-facter-101
 export FACTER_RDS_HOST=$(jq -r .Address /home/ubuntu/rds)
 export FACTER_RDS_PORT=$(jq -r .Port /home/ubuntu/rds)
+export FACTER_RDS_ROLE="$RDS_ROLE"
 
 # Create RDS user and database here, instead of using puppet
 # (because drj couldn't work out how to do it in puppet)

deployment/bin/ensure-postgresql-role

@@ -1,6 +1,7 @@
 #!/bin/sh
 
-USER=ubuntu
+# Name and password of PostgreSQL role to create.
+USER=${RDS_ROLE:-refinery}
 PASSWORD=${PASSWORD-password}
 
 HOST=$(jq -r .Address /home/ubuntu/rds)

deployment/stack.py

@@ -72,6 +72,7 @@ def main():
         "#!/bin/sh\n",
         "RDS_NAME=", config['RDS_NAME'], "\n",
         "RDS_SUPERUSER_PASSWORD=", config['RDS_SUPERUSER_PASSWORD'], "\n",
+        "RDS_ROLE=", config['RDS_ROLE'], "\n",
         "GIT_BRANCH=", commit, "\n",
         "\n",
         open('bootstrap.sh').read(),

refinery/config/config.json.erb

@@ -24,7 +24,7 @@
         "NAME": "refinery",
         "PASSWORD": "<%= @rds_role_password %>",
         "PORT": "<%= @rds_port %>",
-        "USER": "<%= @app_user || "vagrant" %>"
+        "USER": "<%= @rds_role || "vagrant" %>"
     }
   },
   "DEFAULT_FROM_EMAIL": "webmaster@localhost",