Abuse the bandshell timer a bit

bin/bandshell-timer.rb

@@ -5,6 +5,7 @@
 # Periodically ping the bandshell web app so that background tasks
 # may be performed. Called by bandshelld as a daemon.
 require "net/http"
+require 'bandshell/config_store'
 
 def linestamp
   "bandshell-timer.rb ("+Time.now.to_s+"): "
@@ -21,9 +22,15 @@ def linestamp
 puts linestamp + "connecting to bandshell at " + BandshellURL
 
 StatusURI = URI.parse(BandshellURL+"/background-job")
-  
+
 loop do
   sleep(5)
+  #if a system password is stored as a config, we need to restart bandshelld
+  #to execute chpasswd and clear that config
+  if Bandshell::ConfigStore.config_exists?('system_password')
+    system("bandshelld restart")
+  end
+
   begin
     response = Net::HTTP.get_response(StatusURI)
   rescue Errno::ECONNREFUSED

bin/bandshelld

@@ -7,6 +7,8 @@ require "daemons"
 require "bandshell/application/app"
 require 'bandshell/config_store'
 
+#if the password has not been changed before during initial setup,
+#read a new one and change passwords accordingly
 unless Bandshell::ConfigStore.config_exists?('system_passwords_changed')
   system_password = Bandshell::ConfigStore.read_config('system_password', '')
   unless system_password.empty?

lib/bandshell/application/app.rb

@@ -180,7 +180,9 @@ def validate_url(url)
   end
 
   get '/' do
-    if concerto_url == ''
+    if !Bandshell::ConfigStore.config_exists?('system_passwords_changed')
+      redirect '/system_password'
+    elsif concerto_url == ''
       redirect '/setup'
     else
       redirect '/player_status'

lib/bandshell/application/views/system_password.erb

@@ -1,6 +1,6 @@
 <%= erb(:navbar, :layout => false) %>
 
-<h3>Please change the SSH password for this machine here. Once the password is set, further changes can be made via the command line.</h3>
+<h3>Please change the SSH password for this player here. Once the password is set, further changes can be made via the command line.</h3>
 
 <div class="default-padding">
   <form method="post">