??

2019-05-20 01:39:19 -04:00
parent 977318fbe4
commit 8b69ba10a7
50 changed files with 11 additions and 11 deletions
--- a/ops/app.json
+++ b/ops/app.json
@ -0,0 +1,5 @@
+{
+ "run_list": [
+ 	"role[app]"
+ ]
+}
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/.kitchen.yml
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/.kitchen.yml
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/Berksfile
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/Berksfile
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/LICENSE
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/LICENSE
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/README.md
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/README.md
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/chefignore
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/chefignore
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/data_bags/keys/delivery_builder_keys.json
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/data_bags/keys/delivery_builder_keys.json
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/metadata.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/metadata.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/default.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/default.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/deploy.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/deploy.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/functional.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/functional.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/lint.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/lint.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/provision.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/provision.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/publish.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/publish.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/quality.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/quality.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/security.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/security.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/smoke.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/smoke.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/syntax.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/syntax.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/unit.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/unit.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb
--- a/ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/recipes/default.rb
+++ b/ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/recipes/default.rb
--- a/ops/cookbooks/hosting/.delivery/config.json
+++ b/ops/cookbooks/hosting/.delivery/config.json
--- a/ops/cookbooks/hosting/.delivery/project.toml
+++ b/ops/cookbooks/hosting/.delivery/project.toml
--- a/ops/cookbooks/hosting/.gitignore
+++ b/ops/cookbooks/hosting/.gitignore
--- a/ops/cookbooks/hosting/.kitchen.yml
+++ b/ops/cookbooks/hosting/.kitchen.yml
--- a/ops/cookbooks/hosting/Berksfile
+++ b/ops/cookbooks/hosting/Berksfile
--- a/ops/cookbooks/hosting/CHANGELOG.md
+++ b/ops/cookbooks/hosting/CHANGELOG.md
--- a/ops/cookbooks/hosting/LICENSE
+++ b/ops/cookbooks/hosting/LICENSE
--- a/ops/cookbooks/hosting/README.md
+++ b/ops/cookbooks/hosting/README.md
--- a/ops/cookbooks/hosting/chefignore
+++ b/ops/cookbooks/hosting/chefignore
--- a/ops/cookbooks/hosting/metadata.rb
+++ b/ops/cookbooks/hosting/metadata.rb
@ -1,4 +1,4 @@
-name 'hosting'
+name 'app'
 maintainer 'The Authors'
 maintainer_email 'you@example.com'
 license 'All Rights Reserved'
--- a/ops/cookbooks/hosting/recipes/default.rb
+++ b/ops/cookbooks/hosting/recipes/default.rb
--- a/ops/cookbooks/hosting/recipes/gitea.rb
+++ b/ops/cookbooks/hosting/recipes/gitea.rb
--- a/ops/cookbooks/hosting/recipes/mkdir.rb
+++ b/ops/cookbooks/hosting/recipes/mkdir.rb
--- a/ops/cookbooks/hosting/recipes/nginx.rb
+++ b/ops/cookbooks/hosting/recipes/nginx.rb
--- a/ops/cookbooks/hosting/recipes/postgress.rb
+++ b/ops/cookbooks/hosting/recipes/postgress.rb
--- a/ops/cookbooks/hosting/recipes/user.rb
+++ b/ops/cookbooks/hosting/recipes/user.rb
--- a/ops/cookbooks/hosting/spec/spec_helper.rb
+++ b/ops/cookbooks/hosting/spec/spec_helper.rb
--- a/ops/cookbooks/hosting/spec/unit/recipes/default_spec.rb
+++ b/ops/cookbooks/hosting/spec/unit/recipes/default_spec.rb
--- a/ops/cookbooks/hosting/templates/app.ini.erb
+++ b/ops/cookbooks/hosting/templates/app.ini.erb
--- a/ops/cookbooks/hosting/templates/autossl.conf.erb
+++ b/ops/cookbooks/hosting/templates/autossl.conf.erb
--- a/ops/cookbooks/hosting/templates/gitea_postgres.sql.erb
+++ b/ops/cookbooks/hosting/templates/gitea_postgres.sql.erb
--- a/ops/cookbooks/hosting/templates/host.conf.erb
+++ b/ops/cookbooks/hosting/templates/host.conf.erb
--- a/ops/cookbooks/hosting/templates/nginx.conf.erb
+++ b/ops/cookbooks/hosting/templates/nginx.conf.erb
--- a/ops/cookbooks/hosting/test/integration/default/default_test.rb
+++ b/ops/cookbooks/hosting/test/integration/default/default_test.rb
--- a/ops/hosting.json
+++ b/ops/hosting.json
@ -1,3 +0,0 @@
-{
- "run_list": [ "role[gitea]"]
-}
--- a/ops/roles/gitea.rb
+++ b/ops/roles/gitea.rb
@ -1,4 +1,4 @@
-name :gitea
+name :app
 description "A basic role"

 run_list(
@ -7,6 +7,4 @@ run_list(
 	"recipe[hosting::postgress]",
 	"recipe[hosting::gitea]",
 	"recipe[hosting::nginx]",
-
-
-)
+)