ktec-subtrac 0.1.49 → 0.1.50

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 49
+:patch: 50

data/lib/subtrac/apache/vhost.conf.erb

@@ -13,7 +13,7 @@
 	<location />
 		AuthType Basic
 		AuthName '<%= server_name %>'
-		AuthUserFile <%= install_dir %>/.passwd
+		AuthUserFile <%= auth_dir %>/.passwd
 		Require valid-user
 		AuthBasicProvider file
 		<% if enable_ldap then %>

data/lib/subtrac/apache.rb

@@ -14,12 +14,10 @@ module Subtrac
       puts "\n==== Creating new virtual host ===="
       # TODO: Place a file in apache2 conf with Include directive which points to our conf folder
       template = get_template("vhost.conf.erb")
-      template.write(File.join(Config.apache_conf_dir,Config.server_hostname))
-      puts("template written")
+      file_name = File.join(Config.apache_conf_dir,Config.server_hostname)
+      template.write(file_name)
       enable_site()
-      puts("enabled site")
       force_reload()
-      puts("apache reloaded")
     end
     # creates the files necessary for a new client
     def create_client(client)
@@ -33,10 +31,12 @@ module Subtrac
     def force_reload
       # reload apache configuration
       `/etc/init.d/apache2 force-reload` if SUBTRAC_ENV != 'test'
+      puts("Apache reloaded...")
     end
     def enable_site
       # tell apache enable site
       `a2ensite #{Config.server_hostname}` if SUBTRAC_ENV != 'test'
+      puts("Apache site enabled...")
     end
     def create_project(project)
       # we dont need to do anything for each project, but we do need to ensure a client location exists

data/lib/subtrac/config/config.yml

@@ -42,6 +42,7 @@ development: &non_production_settings
         :conf: conf
         :locations: locations
         :temp: tmp
+        :auth: auth
 
 test:
     <<: *non_production_settings

data/lib/subtrac/config.rb

@@ -174,6 +174,10 @@ module Subtrac
         @log_dir ||= File.join(install_dir,@data[:dirs][:log])
       end
 
+      def auth_dir
+        @auth_dir ||= File.join(install_dir,@data[:dirs][:auth])
+      end
+
       def locations_dir
         @locations_dir ||= File.join(install_dir,@data[:dirs][:locations])
       end

data/lib/subtrac/template.rb

@@ -5,7 +5,7 @@ module Subtrac
       @template = template
     end
     def render
-      puts "Template rendering #{@template}"
+      puts "Rendering template: #{File.basename(@template)}"
       b = Config.get_binding
       ERB.new(IO.read(@template)).result(b)
     end
@@ -13,8 +13,8 @@ module Subtrac
       file = File.open(outfile, 'w+')
       if file
         file_output = render()
-        #puts file_output
         file.syswrite(file_output)
+        puts("Template written: #{File.basename(outfile)}")
       else
         raise "Unable to open file for writing. file #{outfile}"
       end

data/lib/subtrac/trac/common.trac.ini.erb

@@ -185,7 +185,7 @@ password_format = htpasswd
 ; the file where user accounts are stored
 ; the webserver will need write permissions to this file
 ; and its parent folder
-password_file = /var/subtrac/.passwd
+password_file = <%= auth_dir %>/.passwd
 
 [theme]
 theme = CrystalX

data/lib/subtrac.rb

@@ -169,7 +169,7 @@ module Subtrac
       admin_pass = ask("New password:  ") { |q| q.echo = "*" }
       admin_pass_confirm = ask("Re-type new password:  ") { |q| q.echo = "*" }
       if (admin_pass == admin_pass_confirm) then
-        passwd_file = File.join(Config.install_dir, ".passwd")
+        passwd_file = File.join(Config.auth_dir, ".passwd")
         `htpasswd -c -b #{passwd_file} #{admin_user} #{admin_pass}`
         Config.data[:admin_user] = admin_user
         Config.data[:admin_pass] = admin_pass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ktec-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.49
+  version: 0.1.50
 platform: ruby
 authors: 
 - Keith Salisbury