capistrano-exfel 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddbd8c8afa8131b2f98ce4971c1a7ca35284f3cb
-  data.tar.gz: 6c9e2fbd5a8efb408e92830e74a1361157fd9cb1
+  metadata.gz: c0aeb56d864c2efec5a15953a2e03ab05cf58d5d
+  data.tar.gz: b1cdba8f0060048df9888c6ce8f0a6a4e14a4db6
 SHA512:
-  metadata.gz: 2189e6e380c9eafc21e872a5bdaa89709a75bb515e9c9c506db738f5c39bb75c0b30555db6ff9fa0375f619d2cb650871048b4e323966164013b7a22b11a8db1
-  data.tar.gz: 02ce4e676abe924264abc4e9cf9e7dfbed54b604e11eae23b5e72357df82e5710a716c826ddb24e62cbbb564d9de23331567a9aa576b2f1a353905b72fa51dd2
+  metadata.gz: 97969e02f112478c14c8dcc2c64b7bdae59dc6298bf8e27d51c1ab797f43600966a96a2f48c828c507edbb86fab2d28fcfe3e2c304a3b53fe7da90d610e13944
+  data.tar.gz: a8a33bc5d7db59f500662c6a30a1951b067af03c7ffaa6a61b151c9dcbbd822a3cc8277ce7d711f5d43f3cd1b480daac64c31ed03f524f68632da5325ced0ed6

data/README.md

@@ -12,7 +12,7 @@ Add these lines to your application's Gemfile:
     gem 'capistrano', '~> 3.4.0'
     gem 'capistrano-rails', '~> 1.1.2'
     gem 'capistrano-rvm', '~> 0.1.2'
-    gem 'capistrano-exfel', '~> 0.0.11'
+    gem 'capistrano-exfel', '~> 0.0.12'
 
 And then execute:
 
@@ -75,7 +75,7 @@ The most important configurable options and their defaults:options can be added
     set :app_name, 'my_app_name' # If not specified will ask for it
 
     # Set application related information
-    # set :app_domain, 'https://in.xfel.eu/'
+    # set :app_domain, 'https://domain.com/'
     # set :app_name_uri, 'my_app_uri'
 
     # Set git repository information

data/capistrano-exfel.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Capistrano::Exfel::VERSION
   spec.authors       = ['Luis Maia']
   spec.email         = ['luisgoncalo.maia@gmail.com']
-  spec.summary       = 'Deploy Ruby on Rails 4 Applications in European-XFEL Virtual Machines'
-  spec.description   = 'Deployment of Ruby on Rails 4 Applications in European-XFEL Virtual Machines ' \
+  spec.summary       = 'Deploy Ruby on Rails 4 Applications in EXFEL Virtual Machines'
+  spec.description   = 'Deployment of Ruby on Rails 4 Applications in EXFEL Virtual Machines ' \
                         '(Scientific Linux + Apache + RVM + Phusion Passenger) using Capistrano3 and Kerberos'
   spec.homepage      = ''
   spec.license       = 'MIT'

data/lib/capistrano/exfel/version.rb

@@ -1,6 +1,6 @@
 module Capistrano
   # Capistrano::Exfel version information
   module Exfel
-    VERSION = '0.0.11'
+    VERSION = '0.0.12'
   end
 end

data/lib/capistrano/recipes/apache_ssl.conf

@@ -75,7 +75,7 @@ SSLCryptoDevice builtin
 
 # General setup for the virtual host, inherited from global configuration
 DocumentRoot "/var/www/html"
-ServerName in.xfel.eu
+ServerName <<SERVER_NAME>>
 
 # Use separate log files for the SSL virtual host; note that LogLevel
 # is not inherited from httpd.conf.

data/lib/capistrano/recipes/config/secrets_example.yml

@@ -15,32 +15,29 @@ defaults: &defaults
   secret_key_base: '___secret_that_must_be_replaced_after_deploy___'
 
   # Application name
-  app_name: 'MyApp'
+  app_name: '<<APP_NAME>>'
 
-  # Domain where the application is available including the http(s) protocol (e.g. https://in.xfel.eu/)
+  # Domain where the application is available including the http(s) protocol (e.g. <<APP_DOMAIN>>)
   # Note that the final '/' character is mandatory
   # Examples:
   # * 'http://localhost:3000/'  - The application is available under 'localhost'
-  # * 'https://in.xfel.eu/'     - The application is available under a server RackBaseURI
-  site_domain: 'http://localhost:3000/'
-  #site_domain: 'https://in.xfel.eu/'
+  # * 'https://example.com/'    - The application is available under a server RackBaseURI
+  site_domain: '<<APP_DOMAIN>>'
 
   # Sub domain where the application is available (e.g. my_app)
   # Examples:
   # * ""        - The application is available under '/' (the server root)
   # * '/my_app' - The application is available under '/my_app'
-  app_sub_domain_uri: '/my_app' # guarantee that the leading slash is there if value isn't an empty String
-  #app_sub_domain_uri: ""
+  app_sub_domain_uri: '/<<APP_NAME_URI>>' # guarantee that the leading slash is there if value isn't an empty String
 
   # Sub domain to be applied to the Router
   # Examples:
   # * ""       - The application URI routing is done via HTTP Server (e.g. Apache or NGINX)
   # * 'my_app' - The application URI routing must be done via code
-  routes_base_uri: 'my_app'
-  #routes_base_uri: ""
+  routes_base_uri: '<<APP_NAME_URI>>'
 
-  # Application full url to be used as config.action_mailer.default_url_options (e.g. https://in.xfel.eu/my_app)
-  app_full_url: 'http://localhost:3000/my_app'
+  # Application full url to be used as config.action_mailer.default_url_options (e.g. https://example.com/my_app)
+  app_full_url: '<<APP_FULL_URL>>'
 
   # Google Analytics code
   google_analytics_code: 'UA-XXXXXXXX-Y'
@@ -92,7 +89,7 @@ defaults: &defaults
   facebook_app_secret: ""
   github_app_id: ""
   github_app_secret: ""
-  kerberos_title: 'European-XFEL Registry'
+  kerberos_title: 'XFEL'
 
 #
 development:

data/lib/capistrano/tasks/apache.rake

@@ -131,6 +131,9 @@ namespace :apache do
       debug "chmod g+w #{fetch(:shared_apache_conf_ssl_file)}"
       execute "chmod g+w #{fetch(:shared_apache_conf_ssl_file)}"
 
+      server_name = string_between_markers(fetch(:app_domain), '://', '/')
+
+      execute "sed -i 's/<<SERVER_NAME>>/#{server_name}/g' #{fetch(:shared_apache_conf_ssl_file)}"
       execute "sed -i 's/<<APPLICATION_NAME>>/#{fetch(:app_name_uri)}/g' #{fetch(:shared_apache_conf_ssl_file)}"
       execute "sed -i 's/<<ENVIRONMENT>>/#{fetch(:environment)}/g' #{fetch(:shared_apache_conf_ssl_file)}"
 

data/lib/capistrano/tasks/app_home.rake

@@ -131,8 +131,8 @@ namespace :app_home do
   task :reload_server_cache do
     on roles(:app), in: :sequence, wait: 5 do
       debug '#' * 100
-      debug "wget -v -p --spider https://in.xfel.eu/#{fetch(:app_name_uri)}"
-      execute :wget, "-v -p --spider https://in.xfel.eu/#{fetch(:app_name_uri)}"
+      debug "wget -v -p --spider #{fetch(:app_domain)}#{fetch(:app_name_uri)}"
+      execute :wget, "-v -p --spider #{fetch(:app_domain)}#{fetch(:app_name_uri)}"
       debug 'Application visited successfully...'
       debug '#' * 100
     end
@@ -143,7 +143,7 @@ namespace :app_home do
       info '#' * 100
       info '#' * 10 + ' => Application Successfully deployed...'
       info '#' * 100
-      info '#' * 10 + " => visit: https://in.xfel.eu/#{fetch(:app_name_uri)}"
+      info '#' * 10 + " => visit: #{fetch(:app_domain)}#{fetch(:app_name_uri)}"
       info '#' * 100
     end
   end

data/lib/capistrano/tasks/application.rake

@@ -1,4 +1,4 @@
-# XFEL application specific tasks
+# EXFEL application specific tasks
 namespace :application do
   # Task 'application:deploy_first_time' deploys an application for the first time in the configured server(s).
   # This task besides deploying the application also make all the necessary configurations
@@ -97,7 +97,8 @@ namespace :load do
 
     # Set application related information
     set :app_domain, -> do
-      ask('Please specify the application domain (i.e. https://in.xfel.eu/)', 'https://in.xfel.eu/')
+      ask('Please specify the application domain with an "/" at the end (i.e. https://example.com/)',
+          'https://example.com/')
     end
 
     # Build default application URI

data/lib/capistrano/tasks/secrets.rake

@@ -35,6 +35,11 @@ namespace :secrets do
         upload! StringIO.new(File.read("#{fetch(:secrets_original_file_path)}")), "#{fetch(:secrets_file_path)}"
       end
 
+      execute "sed -i 's/<<APP_NAME>>/#{fetch(:app_name)}/g' #{fetch(:secrets_file_path)}"
+      execute "sed -i 's/<<APP_DOMAIN>>/#{fetch(:app_domain)}/g' #{fetch(:secrets_file_path)}"
+      execute "sed -i 's/<<APP_NAME_URI>>/#{fetch(:app_name_uri)}/g' #{fetch(:secrets_file_path)}"
+      execute "sed -i 's/<<APP_FULL_URL>>/#{fetch(:app_full_url)}/g' #{fetch(:secrets_file_path)}"
+
       debug '#' * 50
     end
   end

data/lib/capistrano/tasks/util.rake

@@ -39,6 +39,10 @@ def execute_rake_command(task)
   end
 end
 
+def string_between_markers(complete_str, marker1, marker2)
+  complete_str[/#{Regexp.escape(marker1)}(.*?)#{Regexp.escape(marker2)}/m, 1]
+end
+
 namespace :util do
   desc 'Report Server Uptimes'
   task :uptime do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exfel
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Luis Maia
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Deployment of Ruby on Rails 4 Applications in European-XFEL Virtual Machines
+description: Deployment of Ruby on Rails 4 Applications in EXFEL Virtual Machines
   (Scientific Linux + Apache + RVM + Phusion Passenger) using Capistrano3 and Kerberos
 email:
 - luisgoncalo.maia@gmail.com
@@ -91,5 +91,5 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Deploy Ruby on Rails 4 Applications in European-XFEL Virtual Machines
+summary: Deploy Ruby on Rails 4 Applications in EXFEL Virtual Machines
 test_files: []