[ARVADOS] updated: aaafb72c1efb215dd6f6008c98a28f13f850b7fa

[git at public.curoverse.com]

Summary of changes:
 docker/api/setup-gitolite.sh.in |  2 +-
 docker/build_tools/build.rb     | 22 ++++++++++++++++++++++
 docker/compute/wrapdocker       |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

       via  aaafb72c1efb215dd6f6008c98a28f13f850b7fa (commit)
       via  69369eeb2d11290f7ff21a2e2b903390fd3d3369 (commit)
      from  ff1b1d43022df59f80aff7384fc1903c5637ffb9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit aaafb72c1efb215dd6f6008c98a28f13f850b7fa
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Jul 22 16:19:53 2014 -0400

    Make the build script prompt for a shell login name.
    
    refs #3219

diff --git a/docker/build_tools/build.rb b/docker/build_tools/build.rb
index 5e3b1ed..4fef356 100755
--- a/docker/build_tools/build.rb
+++ b/docker/build_tools/build.rb
@@ -64,9 +64,22 @@ def main options
       end
     end
 
+    print "Arvados needs to know the shell login name for the administrative user.\n"
+    print "This will also be used as the name for your git repository.\n"
+    print "\n"
+    user_name = ""
+    until is_valid_user_name? user_name
+      print "Enter a shell login name here: "
+      user_name = gets.strip
+      if not is_valid_user_name? user_name
+        print "That doesn't look like a valid shell login name. Please try again.\n"
+      end
+    end
+
     File.open 'config.yml', 'w' do |config_out|
       config = YAML.load_file 'config.yml.example'
       config['API_AUTO_ADMIN_USER'] = admin_email_address
+      config['ARVADOS_USER_NAME'] = user_name
       config['API_HOSTNAME'] = generate_api_hostname
       config['PUBLIC_KEY_PATH'] = find_or_create_ssh_key(config['API_HOSTNAME'])
       config.each_key do |var|
@@ -114,6 +127,15 @@ def is_valid_email? str
   str.match /^\S+@\S+\.\S+$/
 end
 
+# is_valid_user_name?
+#   Returns true if its arg looks like a valid unix username.
+#   This is a very very loose sanity check.
+#
+def is_valid_user_name? str
+  # borrowed from Debian's adduser (version 3.110)
+  str.match /^[_.A-Za-z0-9][-\@_.A-Za-z0-9]*\$?$/
+end
+
 # generate_api_hostname
 #   Generates a 5-character randomly chosen API hostname.
 #

commit 69369eeb2d11290f7ff21a2e2b903390fd3d3369
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Jul 22 14:48:55 2014 -0400

    Whitespace fixes
    
    refs #3219

diff --git a/docker/api/setup-gitolite.sh.in b/docker/api/setup-gitolite.sh.in
index 0363063..92014f9 100755
--- a/docker/api/setup-gitolite.sh.in
+++ b/docker/api/setup-gitolite.sh.in
@@ -32,7 +32,7 @@ cd /usr/local/arvados/gitolite-tmp/gitolite-admin
 mkdir keydir/arvados
 mkdir conf/admin
 mkdir conf/auto
-echo " 
+echo "
 
 @arvados_git_user = arvados_git_user
 
diff --git a/docker/compute/wrapdocker b/docker/compute/wrapdocker
index 14f3a75..cee1302 100755
--- a/docker/compute/wrapdocker
+++ b/docker/compute/wrapdocker
@@ -85,6 +85,6 @@ popd >/dev/null
 # If a pidfile is still around (for example after a container restart),
 # delete it so that docker can start.
 rm -rf /var/run/docker.pid
-	
+
 exec docker -d
 

-----------------------------------------------------------------------


hooks/post-receive
--