From 977318fbe497db2ba8b22ba8ff389517c4f53de5 Mon Sep 17 00:00:00 2001 From: William Mantly Date: Thu, 16 May 2019 14:14:42 -0400 Subject: [PATCH] better directory struct --- Vagrantfile | 9 ++++-- cookbooks/solo.rb | 2 -- init.sh | 28 +++++++++++++++---- .../.delivery/build_cookbook/.kitchen.yml | 0 .../.delivery/build_cookbook/Berksfile | 0 .../hosting/.delivery/build_cookbook/LICENSE | 0 .../.delivery/build_cookbook/README.md | 0 .../.delivery/build_cookbook/chefignore | 0 .../data_bags/keys/delivery_builder_keys.json | 0 .../.delivery/build_cookbook/metadata.rb | 0 .../build_cookbook/recipes/default.rb | 0 .../build_cookbook/recipes/deploy.rb | 0 .../build_cookbook/recipes/functional.rb | 0 .../.delivery/build_cookbook/recipes/lint.rb | 0 .../build_cookbook/recipes/provision.rb | 0 .../build_cookbook/recipes/publish.rb | 0 .../build_cookbook/recipes/quality.rb | 0 .../build_cookbook/recipes/security.rb | 0 .../.delivery/build_cookbook/recipes/smoke.rb | 0 .../build_cookbook/recipes/syntax.rb | 0 .../.delivery/build_cookbook/recipes/unit.rb | 0 .../build_cookbook/secrets/fakey-mcfakerton | 0 .../test/fixtures/cookbooks/test/metadata.rb | 0 .../cookbooks/test/recipes/default.rb | 0 .../cookbooks}/hosting/.delivery/config.json | 0 .../cookbooks}/hosting/.delivery/project.toml | 0 .../cookbooks}/hosting/.gitignore | 0 .../cookbooks}/hosting/.kitchen.yml | 0 .../cookbooks}/hosting/Berksfile | 0 .../cookbooks}/hosting/CHANGELOG.md | 0 {cookbooks => ops/cookbooks}/hosting/LICENSE | 0 .../cookbooks}/hosting/README.md | 0 .../cookbooks}/hosting/chefignore | 0 .../cookbooks}/hosting/metadata.rb | 0 .../cookbooks}/hosting/recipes/default.rb | 0 .../cookbooks}/hosting/recipes/gitea.rb | 0 .../cookbooks}/hosting/recipes/mkdir.rb | 0 .../cookbooks}/hosting/recipes/nginx.rb | 0 .../cookbooks}/hosting/recipes/postgress.rb | 0 .../cookbooks}/hosting/recipes/user.rb | 0 .../cookbooks}/hosting/spec/spec_helper.rb | 0 .../hosting/spec/unit/recipes/default_spec.rb | 0 .../cookbooks}/hosting/templates/app.ini.erb | 0 .../hosting/templates/autossl.conf.erb | 0 .../hosting/templates/gitea_postgres.sql.erb | 0 .../hosting/templates/host.conf.erb | 0 .../hosting/templates/nginx.conf.erb | 0 .../test/integration/default/default_test.rb | 0 .../cookbooks/vendor}/postgresql/CHANGELOG.md | 0 .../vendor}/postgresql/CONTRIBUTING.md | 0 .../cookbooks/vendor}/postgresql/README.md | 0 .../vendor}/postgresql/libraries/helpers.rb | 0 .../vendor}/postgresql/metadata.json | 0 .../cookbooks/vendor}/postgresql/metadata.rb | 0 .../vendor}/postgresql/resources/access.rb | 0 .../postgresql/resources/client_install.rb | 0 .../vendor}/postgresql/resources/database.rb | 0 .../vendor}/postgresql/resources/extension.rb | 0 .../vendor}/postgresql/resources/ident.rb | 0 .../postgresql/resources/repository.rb | 0 .../postgresql/resources/server_conf.rb | 0 .../postgresql/resources/server_install.rb | 0 .../vendor}/postgresql/resources/user.rb | 0 .../postgresql/templates/pg_hba.conf.erb | 0 .../postgresql/templates/pg_ident.conf.erb | 0 .../postgresql/templates/pgsql.sysconfig.erb | 0 .../postgresql/templates/postgresql.conf.erb | 0 .../templates/postgresql.service.erb | 0 {cookbooks => ops}/hosting.json | 0 {roles => ops/roles}/gitea.rb | 0 ops/solo.rb | 5 ++++ 71 files changed, 33 insertions(+), 11 deletions(-) delete mode 100644 cookbooks/solo.rb rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/.kitchen.yml (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/Berksfile (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/LICENSE (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/README.md (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/chefignore (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/data_bags/keys/delivery_builder_keys.json (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/metadata.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/default.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/deploy.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/functional.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/lint.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/provision.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/publish.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/quality.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/security.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/smoke.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/syntax.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/recipes/unit.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/recipes/default.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/config.json (100%) rename {cookbooks => ops/cookbooks}/hosting/.delivery/project.toml (100%) rename {cookbooks => ops/cookbooks}/hosting/.gitignore (100%) rename {cookbooks => ops/cookbooks}/hosting/.kitchen.yml (100%) rename {cookbooks => ops/cookbooks}/hosting/Berksfile (100%) rename {cookbooks => ops/cookbooks}/hosting/CHANGELOG.md (100%) rename {cookbooks => ops/cookbooks}/hosting/LICENSE (100%) rename {cookbooks => ops/cookbooks}/hosting/README.md (100%) rename {cookbooks => ops/cookbooks}/hosting/chefignore (100%) rename {cookbooks => ops/cookbooks}/hosting/metadata.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/recipes/default.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/recipes/gitea.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/recipes/mkdir.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/recipes/nginx.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/recipes/postgress.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/recipes/user.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/spec/spec_helper.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/spec/unit/recipes/default_spec.rb (100%) rename {cookbooks => ops/cookbooks}/hosting/templates/app.ini.erb (100%) rename {cookbooks => ops/cookbooks}/hosting/templates/autossl.conf.erb (100%) rename {cookbooks => ops/cookbooks}/hosting/templates/gitea_postgres.sql.erb (100%) rename {cookbooks => ops/cookbooks}/hosting/templates/host.conf.erb (100%) rename {cookbooks => ops/cookbooks}/hosting/templates/nginx.conf.erb (100%) rename {cookbooks => ops/cookbooks}/hosting/test/integration/default/default_test.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/CHANGELOG.md (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/CONTRIBUTING.md (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/README.md (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/libraries/helpers.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/metadata.json (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/metadata.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/access.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/client_install.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/database.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/extension.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/ident.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/repository.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/server_conf.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/server_install.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/resources/user.rb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/templates/pg_hba.conf.erb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/templates/pg_ident.conf.erb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/templates/pgsql.sysconfig.erb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/templates/postgresql.conf.erb (100%) rename {cookbooks => ops/cookbooks/vendor}/postgresql/templates/postgresql.service.erb (100%) rename {cookbooks => ops}/hosting.json (100%) rename {roles => ops/roles}/gitea.rb (100%) create mode 100644 ops/solo.rb diff --git a/Vagrantfile b/Vagrantfile index bf93760..93e00c8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -42,9 +42,12 @@ Vagrant.configure("2") do |config| config.vm.provision "chef_solo" do |chef| chef.version = "14.12.3" # version 14.12.9 fails to run - chef.cookbooks_path = "cookbooks/" - chef.roles_path = "roles" - chef.add_role("gitea") + chef.cookbooks_path = [ + 'ops/cookbooks/', + 'ops/cookbooks/vendor' + ] + chef.roles_path = 'ops/roles' + chef.add_role('gitea') chef.json = { 'custom-domain': 'localhost.vm42.us', 'custom-title': 'My gitea server!', diff --git a/cookbooks/solo.rb b/cookbooks/solo.rb deleted file mode 100644 index a1409a8..0000000 --- a/cookbooks/solo.rb +++ /dev/null @@ -1,2 +0,0 @@ -cookbook_path '/opt/theta42/provision-node/cookbooks' -roles_path '/opt/theta42/provision-node/roles' diff --git a/init.sh b/init.sh index ff99252..0501234 100644 --- a/init.sh +++ b/init.sh @@ -1,6 +1,22 @@ -wget https://packages.chef.io/files/stable/chefdk/3.9.0/ubuntu/16.04/chefdk_3.9.0-1_amd64.deb -O chefdk.deb -dpkg -i chefdk.deb -mkdir /opt/theta42 -p -rm -rf /opt/theta42/provision-node -git clone https://git.theta42.com/git-hosting/provision-node.git /opt/theta42/provision-node -chef-solo -c /opt/theta42/provision-node/cookbooks/solo.rb -j /opt/theta42/provision-node/cookbooks/hosting.json + +apt install git wget nano; + +if which chef-solo; then + echo 'found chef-solo, skipping'; +else + echo 'Installing chef-dk'; + + wget https://packages.chef.io/files/stable/chefdk/3.9.0/ubuntu/16.04/chefdk_3.9.0-1_amd64.deb -O chefdk.deb; + + dpkg -i chefdk.deb; +fi + +mkdir /opt/theta42 -p; + +rm -rf /opt/theta42/provision-node; + +## Install the node agent + +git clone https://git.theta42.com/git-hosting/provision-node.git /opt/theta42/provision-node; + +chef-solo -c /opt/theta42/provision-node/cookbooks/solo.rb -j /opt/theta42/provision-node/cookbooks/hosting.json; diff --git a/cookbooks/hosting/.delivery/build_cookbook/.kitchen.yml b/ops/cookbooks/hosting/.delivery/build_cookbook/.kitchen.yml similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/.kitchen.yml rename to ops/cookbooks/hosting/.delivery/build_cookbook/.kitchen.yml diff --git a/cookbooks/hosting/.delivery/build_cookbook/Berksfile b/ops/cookbooks/hosting/.delivery/build_cookbook/Berksfile similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/Berksfile rename to ops/cookbooks/hosting/.delivery/build_cookbook/Berksfile diff --git a/cookbooks/hosting/.delivery/build_cookbook/LICENSE b/ops/cookbooks/hosting/.delivery/build_cookbook/LICENSE similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/LICENSE rename to ops/cookbooks/hosting/.delivery/build_cookbook/LICENSE diff --git a/cookbooks/hosting/.delivery/build_cookbook/README.md b/ops/cookbooks/hosting/.delivery/build_cookbook/README.md similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/README.md rename to ops/cookbooks/hosting/.delivery/build_cookbook/README.md diff --git a/cookbooks/hosting/.delivery/build_cookbook/chefignore b/ops/cookbooks/hosting/.delivery/build_cookbook/chefignore similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/chefignore rename to ops/cookbooks/hosting/.delivery/build_cookbook/chefignore diff --git a/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 similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/data_bags/keys/delivery_builder_keys.json rename to ops/cookbooks/hosting/.delivery/build_cookbook/data_bags/keys/delivery_builder_keys.json diff --git a/cookbooks/hosting/.delivery/build_cookbook/metadata.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/metadata.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/metadata.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/metadata.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/default.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/default.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/default.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/default.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/deploy.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/deploy.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/deploy.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/deploy.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/functional.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/functional.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/functional.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/functional.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/lint.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/lint.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/lint.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/lint.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/provision.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/provision.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/provision.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/provision.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/publish.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/publish.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/publish.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/publish.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/quality.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/quality.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/quality.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/quality.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/security.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/security.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/security.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/security.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/smoke.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/smoke.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/smoke.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/smoke.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/syntax.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/syntax.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/syntax.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/syntax.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/recipes/unit.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/recipes/unit.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/recipes/unit.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/recipes/unit.rb diff --git a/cookbooks/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton b/ops/cookbooks/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton rename to ops/cookbooks/hosting/.delivery/build_cookbook/secrets/fakey-mcfakerton diff --git a/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb b/ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/metadata.rb diff --git a/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 similarity index 100% rename from cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/recipes/default.rb rename to ops/cookbooks/hosting/.delivery/build_cookbook/test/fixtures/cookbooks/test/recipes/default.rb diff --git a/cookbooks/hosting/.delivery/config.json b/ops/cookbooks/hosting/.delivery/config.json similarity index 100% rename from cookbooks/hosting/.delivery/config.json rename to ops/cookbooks/hosting/.delivery/config.json diff --git a/cookbooks/hosting/.delivery/project.toml b/ops/cookbooks/hosting/.delivery/project.toml similarity index 100% rename from cookbooks/hosting/.delivery/project.toml rename to ops/cookbooks/hosting/.delivery/project.toml diff --git a/cookbooks/hosting/.gitignore b/ops/cookbooks/hosting/.gitignore similarity index 100% rename from cookbooks/hosting/.gitignore rename to ops/cookbooks/hosting/.gitignore diff --git a/cookbooks/hosting/.kitchen.yml b/ops/cookbooks/hosting/.kitchen.yml similarity index 100% rename from cookbooks/hosting/.kitchen.yml rename to ops/cookbooks/hosting/.kitchen.yml diff --git a/cookbooks/hosting/Berksfile b/ops/cookbooks/hosting/Berksfile similarity index 100% rename from cookbooks/hosting/Berksfile rename to ops/cookbooks/hosting/Berksfile diff --git a/cookbooks/hosting/CHANGELOG.md b/ops/cookbooks/hosting/CHANGELOG.md similarity index 100% rename from cookbooks/hosting/CHANGELOG.md rename to ops/cookbooks/hosting/CHANGELOG.md diff --git a/cookbooks/hosting/LICENSE b/ops/cookbooks/hosting/LICENSE similarity index 100% rename from cookbooks/hosting/LICENSE rename to ops/cookbooks/hosting/LICENSE diff --git a/cookbooks/hosting/README.md b/ops/cookbooks/hosting/README.md similarity index 100% rename from cookbooks/hosting/README.md rename to ops/cookbooks/hosting/README.md diff --git a/cookbooks/hosting/chefignore b/ops/cookbooks/hosting/chefignore similarity index 100% rename from cookbooks/hosting/chefignore rename to ops/cookbooks/hosting/chefignore diff --git a/cookbooks/hosting/metadata.rb b/ops/cookbooks/hosting/metadata.rb similarity index 100% rename from cookbooks/hosting/metadata.rb rename to ops/cookbooks/hosting/metadata.rb diff --git a/cookbooks/hosting/recipes/default.rb b/ops/cookbooks/hosting/recipes/default.rb similarity index 100% rename from cookbooks/hosting/recipes/default.rb rename to ops/cookbooks/hosting/recipes/default.rb diff --git a/cookbooks/hosting/recipes/gitea.rb b/ops/cookbooks/hosting/recipes/gitea.rb similarity index 100% rename from cookbooks/hosting/recipes/gitea.rb rename to ops/cookbooks/hosting/recipes/gitea.rb diff --git a/cookbooks/hosting/recipes/mkdir.rb b/ops/cookbooks/hosting/recipes/mkdir.rb similarity index 100% rename from cookbooks/hosting/recipes/mkdir.rb rename to ops/cookbooks/hosting/recipes/mkdir.rb diff --git a/cookbooks/hosting/recipes/nginx.rb b/ops/cookbooks/hosting/recipes/nginx.rb similarity index 100% rename from cookbooks/hosting/recipes/nginx.rb rename to ops/cookbooks/hosting/recipes/nginx.rb diff --git a/cookbooks/hosting/recipes/postgress.rb b/ops/cookbooks/hosting/recipes/postgress.rb similarity index 100% rename from cookbooks/hosting/recipes/postgress.rb rename to ops/cookbooks/hosting/recipes/postgress.rb diff --git a/cookbooks/hosting/recipes/user.rb b/ops/cookbooks/hosting/recipes/user.rb similarity index 100% rename from cookbooks/hosting/recipes/user.rb rename to ops/cookbooks/hosting/recipes/user.rb diff --git a/cookbooks/hosting/spec/spec_helper.rb b/ops/cookbooks/hosting/spec/spec_helper.rb similarity index 100% rename from cookbooks/hosting/spec/spec_helper.rb rename to ops/cookbooks/hosting/spec/spec_helper.rb diff --git a/cookbooks/hosting/spec/unit/recipes/default_spec.rb b/ops/cookbooks/hosting/spec/unit/recipes/default_spec.rb similarity index 100% rename from cookbooks/hosting/spec/unit/recipes/default_spec.rb rename to ops/cookbooks/hosting/spec/unit/recipes/default_spec.rb diff --git a/cookbooks/hosting/templates/app.ini.erb b/ops/cookbooks/hosting/templates/app.ini.erb similarity index 100% rename from cookbooks/hosting/templates/app.ini.erb rename to ops/cookbooks/hosting/templates/app.ini.erb diff --git a/cookbooks/hosting/templates/autossl.conf.erb b/ops/cookbooks/hosting/templates/autossl.conf.erb similarity index 100% rename from cookbooks/hosting/templates/autossl.conf.erb rename to ops/cookbooks/hosting/templates/autossl.conf.erb diff --git a/cookbooks/hosting/templates/gitea_postgres.sql.erb b/ops/cookbooks/hosting/templates/gitea_postgres.sql.erb similarity index 100% rename from cookbooks/hosting/templates/gitea_postgres.sql.erb rename to ops/cookbooks/hosting/templates/gitea_postgres.sql.erb diff --git a/cookbooks/hosting/templates/host.conf.erb b/ops/cookbooks/hosting/templates/host.conf.erb similarity index 100% rename from cookbooks/hosting/templates/host.conf.erb rename to ops/cookbooks/hosting/templates/host.conf.erb diff --git a/cookbooks/hosting/templates/nginx.conf.erb b/ops/cookbooks/hosting/templates/nginx.conf.erb similarity index 100% rename from cookbooks/hosting/templates/nginx.conf.erb rename to ops/cookbooks/hosting/templates/nginx.conf.erb diff --git a/cookbooks/hosting/test/integration/default/default_test.rb b/ops/cookbooks/hosting/test/integration/default/default_test.rb similarity index 100% rename from cookbooks/hosting/test/integration/default/default_test.rb rename to ops/cookbooks/hosting/test/integration/default/default_test.rb diff --git a/cookbooks/postgresql/CHANGELOG.md b/ops/cookbooks/vendor/postgresql/CHANGELOG.md similarity index 100% rename from cookbooks/postgresql/CHANGELOG.md rename to ops/cookbooks/vendor/postgresql/CHANGELOG.md diff --git a/cookbooks/postgresql/CONTRIBUTING.md b/ops/cookbooks/vendor/postgresql/CONTRIBUTING.md similarity index 100% rename from cookbooks/postgresql/CONTRIBUTING.md rename to ops/cookbooks/vendor/postgresql/CONTRIBUTING.md diff --git a/cookbooks/postgresql/README.md b/ops/cookbooks/vendor/postgresql/README.md similarity index 100% rename from cookbooks/postgresql/README.md rename to ops/cookbooks/vendor/postgresql/README.md diff --git a/cookbooks/postgresql/libraries/helpers.rb b/ops/cookbooks/vendor/postgresql/libraries/helpers.rb similarity index 100% rename from cookbooks/postgresql/libraries/helpers.rb rename to ops/cookbooks/vendor/postgresql/libraries/helpers.rb diff --git a/cookbooks/postgresql/metadata.json b/ops/cookbooks/vendor/postgresql/metadata.json similarity index 100% rename from cookbooks/postgresql/metadata.json rename to ops/cookbooks/vendor/postgresql/metadata.json diff --git a/cookbooks/postgresql/metadata.rb b/ops/cookbooks/vendor/postgresql/metadata.rb similarity index 100% rename from cookbooks/postgresql/metadata.rb rename to ops/cookbooks/vendor/postgresql/metadata.rb diff --git a/cookbooks/postgresql/resources/access.rb b/ops/cookbooks/vendor/postgresql/resources/access.rb similarity index 100% rename from cookbooks/postgresql/resources/access.rb rename to ops/cookbooks/vendor/postgresql/resources/access.rb diff --git a/cookbooks/postgresql/resources/client_install.rb b/ops/cookbooks/vendor/postgresql/resources/client_install.rb similarity index 100% rename from cookbooks/postgresql/resources/client_install.rb rename to ops/cookbooks/vendor/postgresql/resources/client_install.rb diff --git a/cookbooks/postgresql/resources/database.rb b/ops/cookbooks/vendor/postgresql/resources/database.rb similarity index 100% rename from cookbooks/postgresql/resources/database.rb rename to ops/cookbooks/vendor/postgresql/resources/database.rb diff --git a/cookbooks/postgresql/resources/extension.rb b/ops/cookbooks/vendor/postgresql/resources/extension.rb similarity index 100% rename from cookbooks/postgresql/resources/extension.rb rename to ops/cookbooks/vendor/postgresql/resources/extension.rb diff --git a/cookbooks/postgresql/resources/ident.rb b/ops/cookbooks/vendor/postgresql/resources/ident.rb similarity index 100% rename from cookbooks/postgresql/resources/ident.rb rename to ops/cookbooks/vendor/postgresql/resources/ident.rb diff --git a/cookbooks/postgresql/resources/repository.rb b/ops/cookbooks/vendor/postgresql/resources/repository.rb similarity index 100% rename from cookbooks/postgresql/resources/repository.rb rename to ops/cookbooks/vendor/postgresql/resources/repository.rb diff --git a/cookbooks/postgresql/resources/server_conf.rb b/ops/cookbooks/vendor/postgresql/resources/server_conf.rb similarity index 100% rename from cookbooks/postgresql/resources/server_conf.rb rename to ops/cookbooks/vendor/postgresql/resources/server_conf.rb diff --git a/cookbooks/postgresql/resources/server_install.rb b/ops/cookbooks/vendor/postgresql/resources/server_install.rb similarity index 100% rename from cookbooks/postgresql/resources/server_install.rb rename to ops/cookbooks/vendor/postgresql/resources/server_install.rb diff --git a/cookbooks/postgresql/resources/user.rb b/ops/cookbooks/vendor/postgresql/resources/user.rb similarity index 100% rename from cookbooks/postgresql/resources/user.rb rename to ops/cookbooks/vendor/postgresql/resources/user.rb diff --git a/cookbooks/postgresql/templates/pg_hba.conf.erb b/ops/cookbooks/vendor/postgresql/templates/pg_hba.conf.erb similarity index 100% rename from cookbooks/postgresql/templates/pg_hba.conf.erb rename to ops/cookbooks/vendor/postgresql/templates/pg_hba.conf.erb diff --git a/cookbooks/postgresql/templates/pg_ident.conf.erb b/ops/cookbooks/vendor/postgresql/templates/pg_ident.conf.erb similarity index 100% rename from cookbooks/postgresql/templates/pg_ident.conf.erb rename to ops/cookbooks/vendor/postgresql/templates/pg_ident.conf.erb diff --git a/cookbooks/postgresql/templates/pgsql.sysconfig.erb b/ops/cookbooks/vendor/postgresql/templates/pgsql.sysconfig.erb similarity index 100% rename from cookbooks/postgresql/templates/pgsql.sysconfig.erb rename to ops/cookbooks/vendor/postgresql/templates/pgsql.sysconfig.erb diff --git a/cookbooks/postgresql/templates/postgresql.conf.erb b/ops/cookbooks/vendor/postgresql/templates/postgresql.conf.erb similarity index 100% rename from cookbooks/postgresql/templates/postgresql.conf.erb rename to ops/cookbooks/vendor/postgresql/templates/postgresql.conf.erb diff --git a/cookbooks/postgresql/templates/postgresql.service.erb b/ops/cookbooks/vendor/postgresql/templates/postgresql.service.erb similarity index 100% rename from cookbooks/postgresql/templates/postgresql.service.erb rename to ops/cookbooks/vendor/postgresql/templates/postgresql.service.erb diff --git a/cookbooks/hosting.json b/ops/hosting.json similarity index 100% rename from cookbooks/hosting.json rename to ops/hosting.json diff --git a/roles/gitea.rb b/ops/roles/gitea.rb similarity index 100% rename from roles/gitea.rb rename to ops/roles/gitea.rb diff --git a/ops/solo.rb b/ops/solo.rb new file mode 100644 index 0000000..656c2a9 --- /dev/null +++ b/ops/solo.rb @@ -0,0 +1,5 @@ +cookbook_path [ + '/opt/theta42/provision-node/ops/cookbooks', + '/opt/theta42/provision-node/ops/cookbooks/vendor', +] +roles_path '/opt/theta42/provision-node/ops/roles'