From f7d2665d4f439603994b03b324bc602b2623467b Mon Sep 17 00:00:00 2001 From: Artur Gurgul Date: Wed, 6 Aug 2025 08:00:01 +0200 Subject: [PATCH] save --- .../data/templates}/nginx/default.erb | 0 .../data/templates}/nginx/proxy.erb | 0 lib/make.rb | 1 + recipes/nginx/generate.rb => lib/nginx.rb | 21 +++++++++---------- lib/user.rb | 5 +++++ recipes/example-roda.rb | 11 ++++++++++ 6 files changed, 27 insertions(+), 11 deletions(-) rename {recipes => lib/data/templates}/nginx/default.erb (100%) rename {recipes => lib/data/templates}/nginx/proxy.erb (100%) rename recipes/nginx/generate.rb => lib/nginx.rb (71%) create mode 100644 lib/user.rb create mode 100644 recipes/example-roda.rb diff --git a/recipes/nginx/default.erb b/lib/data/templates/nginx/default.erb similarity index 100% rename from recipes/nginx/default.erb rename to lib/data/templates/nginx/default.erb diff --git a/recipes/nginx/proxy.erb b/lib/data/templates/nginx/proxy.erb similarity index 100% rename from recipes/nginx/proxy.erb rename to lib/data/templates/nginx/proxy.erb diff --git a/lib/make.rb b/lib/make.rb index 1609f01..b8330b1 100644 --- a/lib/make.rb +++ b/lib/make.rb @@ -7,6 +7,7 @@ require 'fileutils' require 'open3' # make for: the user, system, package +# user/usr, system/sys, package/pkg # as regular user, if dependencies provided # user: $HOME/.local diff --git a/recipes/nginx/generate.rb b/lib/nginx.rb similarity index 71% rename from recipes/nginx/generate.rb rename to lib/nginx.rb index cb9f0cc..731af57 100644 --- a/recipes/nginx/generate.rb +++ b/lib/nginx.rb @@ -3,7 +3,12 @@ require 'erb' class NGINXProxy class << self - attr_accessor :domain, :port, :service, :user + attr_accessor :domain, :port, :service, :user, :willcard + + def willcard(value = nil) + @willcard = value unless value.nil? + @willcard + end def domain(value = nil) @domain = value unless value.nil? @@ -27,8 +32,11 @@ class NGINXProxy @service end + ## bundle exec rackup -s puma -b unix:///run/user/1000/http.sock + def generate - template = File.read("proxy.erb") + template_path = File.join(__dir__, 'data', 'templates', 'nginx', 'proxy.erb') + template = File.read(template_path) template = ERB.new(template) template.result(binding) end @@ -48,12 +56,3 @@ class NGINXProxy end end -class ExampleProxy < NGINXProxy - domain "gurgul.org" - service "forgejo" - user "git" - port 3000 -end - -puts ExampleProxy.generate -puts ExampleProxy.path diff --git a/lib/user.rb b/lib/user.rb new file mode 100644 index 0000000..0e36e36 --- /dev/null +++ b/lib/user.rb @@ -0,0 +1,5 @@ + +module User + + +end \ No newline at end of file diff --git a/recipes/example-roda.rb b/recipes/example-roda.rb new file mode 100644 index 0000000..d721902 --- /dev/null +++ b/recipes/example-roda.rb @@ -0,0 +1,11 @@ +require 'nginx' + +class ExampleProxy < NGINXProxy + domain "gurgul.org" + service "forgejo" + user "git" + port 3000 +end + +puts ExampleProxy.generate +puts ExampleProxy.available_path