diff --git a/.gitignore b/.gitignore index c30246e..d1ad403 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,30 @@ # See https://help.github.com/articles/ignoring-files for more about ignoring files. # # If you find yourself ignoring temporary files generated by your text editor # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile '~/.gitignore_global' # Ignore bundler config. /.bundle # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal /db/*.local /db/database.yml # Ignore all logfiles and tempfiles. /log/*.log /tmp *.swp # Ignore config files config/database.yml config/beanstalk.yml config/secrets.yml config/bconsole.conf config/ssh.yml +config/bacula.yml .ruby-version .rspec diff --git a/config/bacula.yml.sample b/config/bacula.yml.sample new file mode 100644 index 0000000..caa9066 --- /dev/null +++ b/config/bacula.yml.sample @@ -0,0 +1,5 @@ +development: + director: ser-baculas-dir + +production: + director: bacula-dir-edet4-dir' diff --git a/config/deploy.rb b/config/deploy.rb index e16f1b4..f40b705 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,23 +1,23 @@ # config valid only for Capistrano 3.1 lock '3.2.1' set :application, 'archiving' set :repo_url, 'git@bitbucket.org:xlembouras/baas.git' set :deploy_to, '/srv/archiving' -set :linked_files, %w(config/database.yml config/secrets.yml config/bconsole.conf config/ssh.yml config/bacukey) +set :linked_files, %w(config/database.yml config/secrets.yml config/bconsole.conf config/ssh.yml config/bacukey config/bacula.yml) set :linked_dirs, %w(log tmp/pids tmp/cache tmp/sockets) set :keep_releases, 5 namespace :deploy do desc 'Restart application' task :restart do on roles(:app), in: :sequence, wait: 5 do execute 'sudo unicornctl respawn' end end after :publishing, :restart end diff --git a/config/initializers/00_settings.rb b/config/initializers/00_settings.rb index 9b8071c..236d98c 100644 --- a/config/initializers/00_settings.rb +++ b/config/initializers/00_settings.rb @@ -1 +1,4 @@ +Baas.settings director_name: YAML.load_file(Rails.root.join('config', 'bacula.yml'))[Rails.env]. + symbolize_keys[:director] + Archiving.settings vima_oauth_enabled: true