procsd 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da11e4c031739d5f93c9b4b4135da9f8589fbe04348ae9dad0a87b212e3de7ec
-  data.tar.gz: cea50b63954f02b21f713e6658feec63017b5718024b0447be5975b628d1ada9
+  metadata.gz: 595c0d49250c7eb5075f7c01b7e6f28814bdc319cca686ad0ee0b5a5cea09c28
+  data.tar.gz: de7f7d1df76a9ec2cfdb7c55a90ca87c89fcb387afb28addd52734f42bcf2193
 SHA512:
-  metadata.gz: b758ae08dbaa3682314f5e378e3b2db1396d73e47e7af096a3176dda7b00a59b040e028ef5af7712068dfcfb1e944367184f29606eb8d30d4af44a9198d49722
-  data.tar.gz: 95ca90f04d4f7a4c2e4569f526920cf91dd18b6fd7a431f17b69bb6509d6c6fc0d210c3e9c8ae96411c1429a9533ad80009fa4f413acef34a57acd0112bf2536
+  metadata.gz: c410272886ffe376089154a6499ccb9da9634732b01b8c84c45627e6a3c5ff73b47106c6680095a3529f01d3f94ab928828c882a50b8f39e5164004063c14bae
+  data.tar.gz: 6d9d84f9fd041b28a543dad0d458a5feed9ac0867062a82cd2af7926adda5d2e91be0162f972154b87cbb51442f1c49aadfb76dee30932406e593648568e0207

data/CHANGELOG.md

@@ -1,4 +1,24 @@
 # CHANGELOG
+## 0.5.5
+* Add: Allow to start/stop/restart particular service in the app target (example: `$ procsd start web`)
+* Add: RuntimeMaxSec option for process
+
+## 0.5.4
+* Add: information how to use SSL integration with Cloudflare CDN enabled
+* Add: procsd config certbot_command command
+
+## 0.5.3
+* Fix: procsd config sudoers command
+* Add: procsd config services command
+
+## 0.5.2
+* Fix: use uniq app name in Nginx config files
+* Add: custom option public_folder_path (Nginx)
+* Add: --dev option for exec command (to require dev_environment in development mode)
+
+## 0.5.1
+* Fix bug `uninitialized constant Procsd::Generator::Pathname`, thanks to @koppen
+
 ## 0.5.0
 * **Breaking change:** Changed the way how to define SSL option for Ngnix configuration in procsd.yml (and by default contact email is not required anymore)
 

data/README.md

@@ -8,7 +8,7 @@ Can we have something similar on the cheap Ubuntu VPS from DigitalOcean? Yes we
 
 ## Getting started
 
-> **Note:** latest version of Procsd is `0.5.0`. Since version `0.4.0` there are some breaking changes. Check the [CHANGELOG.md](CHANGELOG.md). To update to the latest version, run `$ gem update procsd` or `$ bundle update procsd` (if you have already installed procsd).
+> **Note:** latest version of Procsd is `0.5.3`. Since version `0.4.0` there are some breaking changes. Check the [CHANGELOG.md](CHANGELOG.md). To update to the latest version, run `$ gem update procsd` or `$ bundle update procsd` (if you have already installed procsd).
 
 > **Note:** Procsd works best with Capistrano integration: [vifreefly/capistrano-procsd](https://github.com/vifreefly/capistrano-procsd)
 
@@ -64,19 +64,20 @@ You can provide additional options for `create` command:
 * `--dir` - application's working directory, default is current _$PWD_ env variable
 * `--path` - $PATH to include to the each service. Default is current _$PATH_ env variable
 * `--add-to-sudoers` - if option present, procsd will create sudoers rule file `/etc/sudoers.d/app_name` which allow to start/stop/restart app services without a password prompt (passwordless sudo).
-* `--or-restart` - if option provided and services already created, procsd will skip creation and call instead `restart` command. Otherwise (if services are not present), they will be created and (in additional) started.
+* `--or-restart` - if option provided and services already created, procsd will skip creation and call instead `restart` command. Otherwise (if services are not present), they will be created and (in additional) started. It's useful option for deployment tools like Capistrano, Mina, etc.
 
 
 ### Start application
 > Other control commands: `stop` and `restart`
 
+> You can start/stop/restart a particular process by providing it's name, i.e.: `$ procsd restart worker`
+
 ```
 deploy@server:~/sample_app$ procsd start
 
 Started app services (sample_app.target)
 ```
 
-
 ### Check the status
 > You can filter processes, like `$ procsd status worker` (show status only for worker processes) or `$ procsd status worker.2` (show status only for worker.2 process)
 
@@ -192,25 +193,47 @@ Systemd provides [a lot of possibilities](https://www.digitalocean.com/community
 Currently, procsd can not run all processes in development like `foreman start` does. But you can run one single process using `procsd exec` command:
 
 ```
-deploy@server:~/sample_app$ PORT=3000 procsd exec web
+deploy@server:~/sample_app$ procsd exec web
 
 => Booting Puma
-=> Rails 5.2.1 application starting in development
+=> Rails 5.2.1 application starting in production
 => Run `rails server -h` for more startup options
 Puma starting in single mode...
 * Version 3.12.0 (ruby 2.3.0-p0), codename: Llamas in Pajamas
 * Min threads: 5, max threads: 5
-* Environment: development
-* Listening on tcp://localhost:3000
+* Environment: production
+* Listening on tcp://localhost:2501
 Use Ctrl-C to stop
 ```
 
-By default `procsd exec` skip environment variables defined in `procsd.yml`. To run process with production environment, provide `--env` option as well: `procsd exec web --env`.
+`procsd exec` requres all the environment variables defined in `environment` section of `procsd.yml` config file.
+
+Sometimes in development mode you need different environment configuration. For that you can add additional environment section `dev_environment` and require it as well using `--dev` flag, example:
+
+```yaml
+app: sample_app
+environment:
+  PORT: 2501
+  RAILS_ENV: production
+  RAILS_LOG_TO_STDOUT: true
+dev_environment:
+  RAILS_ENV: development
+  SOME_OTHER_DEV_ENV_VARIABLE: value
+```
+
+```
+# Run web process with all environment & dev_environment variables included:
+
+deploy@server:~/sample_app$ procsd exec web --dev
+```
+
+> In case if `dev_environment` has env variable with the same name like in `environment`, this variable will be rewritten with value from `dev_environment`.
+
 
 ### Nginx integration (with automatic HTTPS)
 > Before make sure that you have Nginx installed `sudo apt install nginx` and running `sudo systemctl status nginx`.
 
-If one of your application processes is a web process, you can automatically setup Nginx (reverse proxy) config for it. Why? For example to serve static files (assets, images, etc) directly using fast Nginx, rather than application server. Or to enable SSL support (see below).
+If one of your application processes is a web process, you can automatically setup Nginx (reverse proxy) config for it. Why? For example to serve static files (assets, images, and all other files located in `public` folder or another customly defined folder) directly using fast Nginx, rather than application server. Or to enable SSL support (see below).
 
 Add to your procsd.yml `nginx` section with `server_name` option defined:
 
@@ -218,20 +241,20 @@ Add to your procsd.yml `nginx` section with `server_name` option defined:
 
 > If your application use multiple domains/subdomains, add all of them separated with space: `server_name: my-domain.com us.my-domain.com uk.my-domain.com`
 
-> It's required to provide `PORT` number environment variable in `procsd.yml`. Provided port number will be used to proxy requests from Nginx to application server.
-
-```yml
+```yaml
 app: sample_app
 processes:
   web: bundle exec rails server -p $PORT
   worker: bundle exec sidekiq -e $RAILS_ENV
 formation: web=1,worker=2
 environment:
-  PORT: 2501
+  PORT: 2501 # PORT will be used by Nginx to proxy requests from 0.0.0.0:80/443 to 127.0.0.1:PORT (required)
+  HOST: localhost # Make sure that your application server in production running on 127.0.0.1, not 0.0.0.0
   RAILS_ENV: production
   RAILS_LOG_TO_STDOUT: true
 nginx:
   server_name: my-domain.com
+  public_folder_path: public # path is relative to the main project directory, default value is `public`.
 ```
 
 Configuration is done! Run [procsd create](#create-an-application-export-to-systemd) to create app services with Nginx reverse proxy config:
@@ -258,7 +281,7 @@ Nginx config created and daemon reloaded
   <summary>/etc/nginx/sites-available/sample_app</summary>
 
 ```
-upstream app {
+upstream sample_app {
   server 127.0.0.1:2501;
 }
 
@@ -275,14 +298,14 @@ server {
     add_header Cache-Control public;
   }
 
-  try_files $uri/index.html $uri @app;
-  location @app {
+  try_files $uri/index.html $uri @sample_app;
+  location @sample_app {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_redirect off;
-    proxy_pass http://app;
+    proxy_pass http://sample_app;
   }
 
   client_max_body_size 256M;
@@ -298,13 +321,13 @@ Everything is done. Start app services (`procsd start`) and go to `http://my-dom
 
 #### Auto SSL using Certbot
 
-To generate Nginx config with free SSL certificate (from [Let’s Encrypt](https://letsencrypt.org/)) included, you need to install [Certbot](https://certbot.eff.org/) on the remote server first:
+To generate Nginx config with free SSL certificate (from [Let’s Encrypt](https://letsencrypt.org/)) included, you need to install [Certbot](https://certbot.eff.org/) on the remote server first. For Ubuntu 18.04 (check here instructions for other versions https://certbot.eff.org/lets-encrypt/ubuntufocal-nginx):
 
-```
-sudo apt install software-properties-common
-sudo add-apt-repository ppa:certbot/certbot
-sudo apt update
-sudo apt-get install python-certbot-nginx
+```bash
+$ sudo apt install software-properties-common
+$ sudo add-apt-repository ppa:certbot/certbot
+$ sudo apt update
+$ sudo apt install certbot python-certbot-nginx
 ```
 
 > When you install certbot, it automatically setup a cron job (twice per day) to renew expiring certificates ([Automated Renewals](https://certbot.eff.org/docs/using.html#automated-renewals)), so you don't have to worry about renewing certificates manually.
@@ -318,7 +341,7 @@ nginx:
   ssl: true # added
 ```
 
-Configuration is done. **Make sure that all domains defined in procsd (nginx.server_name) are pointing to the server IP** where application is hosted. Then run `procsd create` as usual:
+Configuration is done. **Make sure that all domains defined in procsd (nginx.server_name) are pointing to the server IP** where application is hosted. Then run `procsd create` _(you will probably need first run `procsd destroy` if app services already exists)_ as usual:
 
 > By default Certbot obtaining certificate from _Let's Encrypt_ without a contact email. If you want to provide contact email, define env variable `CERTBOT_EMAIL` with your email in the `.env` file.
 
@@ -386,26 +409,82 @@ Successfully installed SSL cert using certbot
 That's it. Start app services (`procsd start`) and go to `https://my-domain.com` where you'll see your application proxying with Nginx and SSL enabled.
 
 
+<details/>
+  <summary>Note about using Cloudflare CDN</summary><br>
+
+If you use Cloudflare CDN, that means the process of obtaining Let's Encrypt SSL Certificate will fail. To fix it, install `python-certbot-dns-cloudflare` package:
+
+```bash
+$ sudo apt install certbot python-certbot-dns-cloudflare
+```
+
+Read instructions [here how to get Cloudflare API Token and obtain certificates](https://certbot-dns-cloudflare.readthedocs.io/en/stable/). In short,
+
+**1)** Go to https://dash.cloudflare.com/profile/api-tokens and [get your API Token](https://support.cloudflare.com/hc/en-us/articles/200167836-Where-do-I-find-my-Cloudflare-API-key-).
+
+**2)** Create on the server `~/.secrets/certbot/` directory with `cloudflare.ini` file inside:
+
+```bash
+$ mkdir -p ~/.secrets/certbot/
+$ chmod 0700 ~/.secrets/
+$ touch ~/.secrets/certbot/cloudflare.ini
+$ chmod 0400 ~/.secrets/certbot/cloudflare.ini
+```
+
+**3)** Put inside `cloudflare.ini` file your Cloudflare token:
+
+```bash
+$ sudo nano ~/.secrets/certbot/cloudflare.ini
+```
+
+```bash
+# ~/.secrets/certbot/cloudflare.ini
+
+# Cloudflare API token (example) used by Certbot:
+dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567
+```
+
+**4)** Obtain certificates for all your domains declared in `procsd.yml` using _certbot-dns-cloudflare_ plugin:
+
+```bash
+# Example command for my-domain.com domain:
+
+$ sudo certbot certonly --dns-cloudflare --dns-cloudflare-credentials ~/.secrets/certbot/cloudflare.ini -d my-domain.com
+```
+
+**5)** If all went fine, update Nginx application config with new certificates (using certbot command). To get required certbot command type `$ procsd config certbot_command`, then execute it:
+
+```bash
+# Example command for my-domain.com domain:
+
+$ sudo certbot --agree-tos --no-eff-email --redirect --non-interactive --nginx -d my-domain.com --register-unsafely-without-email
+```
+
+All is done!
+
+</details><br>
+
+
 ## All available commands
 
 ```
 $ procsd --help
 
 Commands:
-  procsd --version, -v   # Print the version
-  procsd config          # Print config files based on current settings. Available types: sudoers
   procsd create          # Create and enable app services
   procsd destroy         # Stop, disable and remove app services
-  procsd disable         # Disable app target
+  procsd start           # Start app services
+  procsd stop            # Stop app services
+  procsd restart         # Restart app services
   procsd enable          # Enable app target
-  procsd exec            # Run app process
-  procsd help [COMMAND]  # Describe available commands or one specific command
-  procsd list            # List all app services
+  procsd disable         # Disable app target
   procsd logs            # Show app services logs
-  procsd restart         # Restart app services
-  procsd start           # Start app services
   procsd status          # Show app services status
-  procsd stop            # Stop app services
+  procsd list            # List all app services
+  procsd exec            # Run single app process with environment
+  procsd config          # Print config files based on current settings. Available types: sudoers, services, certbot_command
+  procsd help [COMMAND]  # Describe available commands or one specific command
+  procsd --version, -v   # Print the version
 ```
 
 
@@ -425,6 +504,7 @@ Commands:
 ## Notes
 
 * If you want to set environment variables per process, [use format](https://github.com/ddollar/foreman/wiki/Per-Process-Environment-Variables) like Foreman recommends.
+
 * To print commands before execution, provide env variable `VERBOSE=true` before procsd command. Example:
 
 ```
@@ -437,11 +517,12 @@ Execute: journalctl --no-pager --no-hostname --all --output short-iso -n 3 --uni
 2018-11-04T19:11:59+0400 sample_app-worker.2[29907]: 2018-11-04T15:11:59.597Z 29907 TID-gne5aeyuz INFO: Booting Sidekiq 5.2.2 with redis options {:id=>"Sidekiq-server-PID-29907", :url=>nil}
 2018-11-04T19:11:59+0400 sample_app-worker.2[29907]: 2018-11-04T15:11:59.601Z 29907 TID-gne5aeyuz INFO: Starting processing, hit Ctrl-C to stop
 ```
+
 * You can use extended format of processes commands inside `procsd.yml` to provide additional restart/stop commands for each process:
 
-> All possible options: `ExecStart`, `ExecReload` and `ExecStop`
+> All possible options: [ExecStart](https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=) (default command to start a process), [ExecReload](https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecReload=), and [ExecStop](https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStop=).
 
-> If procsd.yml has `processes:` option defined, then content of Procfile will be ignored
+> If procsd.yml has `processes:` option defined, then content of Procfile (if it exists) will be ignored.
 
 ```yml
 app: sample_app
@@ -454,6 +535,21 @@ processes:
 
 Why? For example default Ruby on Rails application server [Puma](http://puma.io/) supports [Phased or Rolling restart](https://github.com/puma/puma/blob/master/docs/restart.md#normal-vs-hot-vs-phased-restart) feature. If you provide separate `ExecReload`command for a process, then this command will be called while executing `$ procsd restart` by systemd instead of just killing and starting process again.
 
+* Another option you can provide for each process is [RuntimeMaxSec](https://www.freedesktop.org/software/systemd/man/systemd.service.html#RuntimeMaxSec=). It is used to automatically restart a process every N period of time. Could be useful for worker types of processes (like Sidekiq) where process memory could increase while running:
+
+> Example values for RuntimeMaxSec: `30s` (30 seconds), `5m` (5 minutes), `3h` (3 hours), `1d` (1 day).
+
+```yml
+app: sample_app
+processes:
+  web:
+    ExecStart: bundle exec rails server -p $PORT
+    RuntimeMaxSec: 12h
+```
+
+* If you use Nginx integration but default Nginx requests timeout (60s) is too small for you, [you can set a custom timeout](https://serverfault.com/a/777753) in the global Nginx config.
+
+
 ## Capistrano integration
 
 https://github.com/vifreefly/capistrano-procsd
@@ -461,7 +557,6 @@ https://github.com/vifreefly/capistrano-procsd
 
 ## ToDo
 * Add `procsd update` command to quickly update changed configuration (application units, nginx config, etc), instead of calling two separate commands (`procsd destroy` and `procsd create`)
-* Add integration with [Inspeqtor](https://github.com/mperham/inspeqtor) to monitor application services and get alert notifications if something happened
 
 
 ## License

data/lib/procsd/cli.rb

@@ -18,12 +18,16 @@ module Procsd
       preload!
       if @config[:nginx]
         raise ConfigurationError, "Can't find nginx executable available" unless in_path?("nginx")
-        unless Dir.exist?(File.join options["dir"], "public")
-          raise ConfigurationError, "Missing public/ folder to use with Nginx"
+
+        public_folder_path = @config[:nginx]["public_folder_path"] || "public"
+        unless Dir.exist?(File.join options["dir"], public_folder_path)
+          raise ConfigurationError, "Missing public folder path to use with Nginx"
         end
+
         unless @config.dig(:environment, "PORT")
           raise ConfigurationError, "Please provide PORT environment variable in procsd.yml to use with Nginx"
         end
+
         if @config[:nginx]["ssl"]
           raise ConfigurationError, "Can't find certbot executable available" unless in_path?("certbot")
         end
@@ -70,7 +74,7 @@ module Procsd
             execute %W(sudo rm #{path}) and say "Deleted: #{path}" if File.exist?(path)
           end
 
-          execute %w(sudo systemctl restart nginx)
+          execute %w(sudo systemctl reload-or-restart nginx)
           say("Nginx config removed and daemon reloaded", :green)
         end
       else
@@ -101,44 +105,67 @@ module Procsd
     end
 
     desc "start", "Start app services"
-    def start
+    def start(service_name = nil)
       preload!
       say_target_not_exists and return unless target_exist?
 
-      say "Note: app target #{target_name} already started/active" if target_active?
-      if execute %W(sudo systemctl start #{target_name})
-        say("Started app services (#{target_name})", :green)
+      if service_name
+        full_name = to_full_name(service_name)
+        say "Note: app service #{full_name} already started/active" if service_active?(full_name)
+        if execute %W(sudo systemctl start #{full_name} --all)
+          say("Started app service (#{full_name})", :green)
+        end
+      else
+        say "Note: app target #{target_name} already started/active" if target_active?
+        if execute %W(sudo systemctl start #{target_name})
+          say("Started app services (#{target_name})", :green)
+        end
       end
     end
 
     desc "stop", "Stop app services"
-    def stop
+    def stop(service_name = nil)
       preload!
       say_target_not_exists and return unless target_exist?
 
-      say "Note: app target #{target_name} already stopped/inactive" if !target_active?
-      if execute %W(sudo systemctl stop #{target_name})
-        say("Stopped app services (#{target_name})", :green)
+      if service_name
+        full_name = to_full_name(service_name)
+        say "Note: app service #{full_name} already stopped/inactive" if !service_active?(full_name)
+        if execute %W(sudo systemctl stop #{full_name} --all)
+          say("Stopped app service (#{full_name})", :green)
+        end
+      else
+        say "Note: app target #{target_name} already stopped/inactive" if !target_active?
+        if execute %W(sudo systemctl stop #{target_name})
+          say("Stopped app services (#{target_name})", :green)
+        end
       end
     end
 
     desc "restart", "Restart app services"
-    def restart
+    def restart(service_name = nil)
       preload!
       say_target_not_exists and return unless target_exist?
 
-      # If one of the child services of a target has `ExecReload` and `ReloadPropagatedFrom`
-      # options defined, then use `reload-or-restart` to call all services (not the main target)
-      # because of systemd bug https://github.com/systemd/systemd/issues/10638
-      success =
-        if has_reload?
-          execute %W(sudo systemctl reload-or-restart #{app_name}-* --all)
-        else
-          execute %W(sudo systemctl restart #{target_name})
+      if service_name
+        full_name = to_full_name(service_name)
+        if execute %W(sudo systemctl reload-or-restart #{full_name} --all)
+          say("Restarted app service (#{full_name})", :green)
         end
+      else
+        # If one of the child services of a target has `ExecReload` and `ReloadPropagatedFrom`
+        # options defined, then use `reload-or-restart` to call all services (not the main target)
+        # because of systemd bug https://github.com/systemd/systemd/issues/10638
+        success =
+          if has_reload?
+            execute %W(sudo systemctl reload-or-restart #{app_name}-* --all)
+          else
+            execute %W(sudo systemctl restart #{target_name})
+          end
 
-      if success
-        say("Restarted app services (#{target_name})", :green)
+        if success
+          say("Restarted app services (#{target_name})", :green)
+        end
       end
     end
 
@@ -155,7 +182,7 @@ module Procsd
         command = %w(systemctl status --no-pager --output short-iso --all)
       end
 
-      command << (options["target"] ? target_name : "#{app_name}-#{service_name}*")
+      command << (options["target"] ? target_name : to_full_name(service_name))
       execute command, type: :exec
     end
 
@@ -188,33 +215,49 @@ module Procsd
       execute command, type: :exec
     end
 
-    desc "config", "Print config files based on current settings. Available types: sudoers"
+    desc "config", "Print config files based on current settings. Available types: sudoers, services, certbot_command"
     def config(name)
       preload!
 
+      options = { "user" => ENV["USER"], "dir" => ENV["PWD"], "path" => `/bin/bash -ilc 'echo $PATH'`.strip }
+      generator = Generator.new(@config, options)
+
       case name
       when "sudoers"
-        say generate_sudoers_rule(ENV["USER"])
+        puts generator.generate_sudoers(options["user"], has_reload: has_reload?)
+      when "services"
+        return unless valid_create_options?(options)
+
+        services = generator.generate_units
+        services.each do |service_name, service_data|
+          puts "Service: #{service_name} (size: #{service_data[:size]}):"
+          puts "---\n\n"
+          puts service_data[:content]
+          puts "---\n\n"
+        end
+      when "certbot_command"
+        puts get_certbot_command.join(' ')
       else
-        raise ArgumentError, "Wring type of argument: #{name}"
+        raise ArgumentError, "Wrong type of argument: #{name}"
       end
     end
 
     map exec: :__exec
-    desc "exec", "Run app process"
-    option :env, type: :boolean, banner: "Require environment defined in procsd.yml"
+    desc "exec", "Run single app process with environment"
+    option :dev, type: :boolean, banner: "Require dev_environment (in additional to base env) defined in procsd.yml"
     def __exec(process_name)
       preload!
 
       start_cmd = @config[:processes].dig(process_name, "commands", "ExecStart")
       raise ArgumentError, "Process is not defined: #{process_name}" unless start_cmd
 
-      if options["env"]
-        @config[:environment].each { |k, v| @config[:environment][k] = v.to_s }
-        exec @config[:environment], start_cmd
-      else
-        exec start_cmd
+      process_env = @config[:environment].each { |k, v| @config[:environment][k] = v.to_s }
+      if options["dev"]
+        dev_env = @config[:dev_environment].each { |k, v| @config[:dev_environment][k] = v.to_s }
+        process_env.merge!(dev_env)
       end
+
+      exec process_env, start_cmd
     end
 
     map %w[--version -v] => :__print_version
@@ -225,16 +268,23 @@ module Procsd
 
     private
 
-    def perform_create
-      options.each do |key, value|
+    def valid_create_options?(opts)
+      opts.each do |key, value|
         next unless %w(user dir path).include? key
         if value.nil? || value.empty?
-          say("Can't fetch value for --#{key}, please provide it's as an argument", :red) and return
+          say("Can't fetch value for --#{key}, please provide it's as an argument", :red)
+          return false
         else
           say("Value of the --#{key} option: #{value}", :yellow)
         end
       end
 
+      true
+    end
+
+    def perform_create
+      return unless valid_create_options?(options)
+
       generator = Generator.new(@config, options)
       generator.generate_units(save: true)
 
@@ -267,31 +317,38 @@ module Procsd
 
       if nginx = @config[:nginx]
         generator.generate_nginx_conf(save: true)
-        execute %w(sudo systemctl restart nginx)
-        say("Nginx config created and daemon reloaded", :green)
+        say("Nginx config created", :green)
 
         # Reference: https://certbot.eff.org/docs/using.html#certbot-command-line-options
         # How it works in Caddy https://caddyserver.com/docs/automatic-https
         if nginx["ssl"]
-          command = %w(sudo certbot --agree-tos --no-eff-email --redirect --non-interactive --nginx)
-          nginx["server_name"].split(" ").map(&:strip).each do |domain|
-            command.push("-d", domain)
-          end
-
-          if email = ENV["CERTBOT_EMAIL"]
-            command.push("--email", email)
-          else
-            command << "--register-unsafely-without-email"
-          end
-
+          certbot_command = get_certbot_command
           say "Trying to obtain SSL certificate for Nginx config using Certbot..."
-          if execute command
+          if execute certbot_command
             say("Successfully installed SSL cert using Certbot", :green)
           else
             msg = "Failed to install SSL cert using Certbot. Make sure that all provided domains are pointing to this server IP."
             say(msg, :red)
           end
         end
+
+        if execute %w(sudo systemctl reload-or-restart nginx)
+          say("Nginx daemon reloaded", :green)
+        end
+      end
+    end
+
+    def get_certbot_command
+      command = %w(sudo certbot --agree-tos --no-eff-email --redirect --non-interactive --nginx)
+
+      @config[:nginx]["server_name"].split(" ").map(&:strip).each do |domain|
+        command.push("-d", domain)
+      end
+
+      if email = ENV["CERTBOT_EMAIL"]
+        command.push("--email", email)
+      else
+        command << "--register-unsafely-without-email"
       end
     end
 
@@ -342,10 +399,18 @@ module Procsd
       system "systemctl", "is-active", "--quiet", target_name
     end
 
+    def service_active?(service_name)
+      system "systemctl", "is-active", "--quiet", service_name
+    end
+
     def target_name
       "#{app_name}.target"
     end
 
+    def to_full_name(service_name)
+      "#{app_name}-#{service_name}*"
+    end
+
     def app_name
       @config[:app]
     end
@@ -394,6 +459,8 @@ module Procsd
       end
 
       @config[:environment] = procsd["environment"] || {}
+      @config[:dev_environment] = procsd["dev_environment"] || {}
+
       @config[:systemd_dir] = procsd["systemd_dir"] || DEFAULT_SYSTEMD_DIR
       @config[:nginx] = procsd["nginx"]
     end

data/lib/procsd/generator.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Procsd
   class Generator
     attr_reader :app_name, :target_name
@@ -66,8 +68,11 @@ module Procsd
     end
 
     def generate_nginx_conf(save: false)
-      root_path = File.join(@options["dir"], "public")
+      public_folder_path = @config[:nginx]["public_folder_path"] || "public"
+      root_path = File.join(@options["dir"], public_folder_path)
+
       content = generate_template("nginx", {
+        app_name: @config[:app],
         port: @config[:environment]["PORT"],
         server_name: @config[:nginx]["server_name"],
         root: root_path,

data/lib/procsd/templates/nginx.erb

@@ -1,4 +1,4 @@
-upstream app {
+upstream <%= config[:app_name] %> {
   server 127.0.0.1:<%= config[:port] %>;
 }
 
@@ -15,14 +15,14 @@ server {
     add_header Cache-Control public;
   }
 
-  try_files $uri/index.html $uri @app;
-  location @app {
+  try_files $uri/index.html $uri @<%= config[:app_name] %>;
+  location @<%= config[:app_name] %> {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_redirect off;
-    proxy_pass http://app;
+    proxy_pass http://<%= config[:app_name] %>;
   }
 
   client_max_body_size 256M;

data/lib/procsd/templates/service.erb

@@ -18,6 +18,10 @@ ExecStop=/bin/bash -lc '<%= stop %>'
 ExecReload=/bin/bash -lc '<%= reload %>'
 <% end -%>
 
+<% if max_sec = config["commands"]["RuntimeMaxSec"] -%>
+RuntimeMaxSec=<%= max_sec %>
+<% end -%>
+
 Restart=always
 RestartSec=1
 TimeoutStopSec=30

data/lib/procsd/version.rb

@@ -1,3 +1,3 @@
 module Procsd
-  VERSION = "0.5.0"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procsd
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Victor Afanasev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -124,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Manage your application processes in production hassle-free like Heroku CLI