diff --git a/README.md b/README.md index 898d320..93405df 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,14 @@ It allows to simply deploy new server and apply latest updates from repo with ju Please, follow existing file tree and namespace model -* Create namespace folder for new proxy source if not available yet `mkdir nginx/some-provider-name` +* Create namespace folder for new proxy source if not available yet `mkdir nginx/some-domain-name` + Namespace folder must have same name as it `proxy_pass` target value -* Add provider folder into namespace created `mkdir nginx/some-provider-name/some-provider-alias` +* Add provider folder into namespace created `mkdir nginx/some-domain-name/some-provider-name` + Provider folder must have same name as it `server_name` value + For subfolder configurations, just make plain folder name without dots -* Attach at least one server file configuration `nginx/some-provider-name/some-provider-alias/server.conf` -* Create `nginx/some-provider-name/some-provider-alias/README.md` and describe install/uninstall steps +* Attach at least one server file configuration `nginx/some-domain-name/some-provider-name/server.conf` + + For subfolder configurations, attach location file also `nginx/some-domain-name/some-provider-name/location.conf` +* Create `nginx/some-domain-name/some-provider-name/README.md` and describe there install/uninstall steps * Send your PR to this repo _*YGGbro project provides free namespace `.bro.ygg` for Yggdrasil proxy instances by request._ diff --git a/nginx/opennet.ru/yggbro/opennet.ru/README.md b/nginx/opennet.ru/yggbro/opennet.ru/README.md index 0d1375c..7431779 100644 --- a/nginx/opennet.ru/yggbro/opennet.ru/README.md +++ b/nginx/opennet.ru/yggbro/opennet.ru/README.md @@ -27,7 +27,7 @@ Alternatively, add following requirements to existing `default_server`: ``` include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/handles/redirect.conf; -include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/locations.conf; +include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/location.conf; ``` Test configuration and apply changes @@ -41,7 +41,7 @@ Remove following requirements from existing `default_server`: ``` include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/handles/redirect.conf; -include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/locations.conf; +include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/location.conf; ``` Remove symlink if added before: diff --git a/nginx/opennet.ru/yggbro/opennet.ru/locations.conf b/nginx/opennet.ru/yggbro/opennet.ru/location.conf similarity index 100% rename from nginx/opennet.ru/yggbro/opennet.ru/locations.conf rename to nginx/opennet.ru/yggbro/opennet.ru/location.conf diff --git a/nginx/opennet.ru/yggbro/opennet.ru/server.conf b/nginx/opennet.ru/yggbro/opennet.ru/server.conf index 584912a..7700a6c 100644 --- a/nginx/opennet.ru/yggbro/opennet.ru/server.conf +++ b/nginx/opennet.ru/yggbro/opennet.ru/server.conf @@ -14,5 +14,5 @@ server { include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/handles/redirect.conf; # Include available locations - include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/locations.conf; + include /etc/yggbro/nginx/opennet.ru/yggbro/opennet.ru/location.conf; } \ No newline at end of file diff --git a/nginx/texty.org.ua/yggbro/texty.org.ua/README.md b/nginx/texty.org.ua/yggbro/texty.org.ua/README.md index a5c9339..aa642c3 100644 --- a/nginx/texty.org.ua/yggbro/texty.org.ua/README.md +++ b/nginx/texty.org.ua/yggbro/texty.org.ua/README.md @@ -13,7 +13,7 @@ This is subfolder configuration, use `server.conf` preset only when `default_ser Alternatively, add following line to existing `default_server`: ``` -include /etc/yggbro/nginx/texty.org.ua/yggbro/texty.org.ua/locations.conf; +include /etc/yggbro/nginx/texty.org.ua/yggbro/texty.org.ua/location.conf; ``` Test configuration and apply changes @@ -30,7 +30,7 @@ Remove symlink if exists: Remove following line from existing `default_server`: ``` -include /etc/yggbro/nginx/texty.org.ua/yggbro/texty.org.ua/locations.conf; +include /etc/yggbro/nginx/texty.org.ua/yggbro/texty.org.ua/location.conf; ``` Test configuration and apply changes diff --git a/nginx/texty.org.ua/yggbro/texty.org.ua/locations.conf b/nginx/texty.org.ua/yggbro/texty.org.ua/location.conf similarity index 100% rename from nginx/texty.org.ua/yggbro/texty.org.ua/locations.conf rename to nginx/texty.org.ua/yggbro/texty.org.ua/location.conf diff --git a/nginx/texty.org.ua/yggbro/texty.org.ua/server.conf b/nginx/texty.org.ua/yggbro/texty.org.ua/server.conf index cf125cb..b4362dc 100644 --- a/nginx/texty.org.ua/yggbro/texty.org.ua/server.conf +++ b/nginx/texty.org.ua/yggbro/texty.org.ua/server.conf @@ -11,5 +11,5 @@ server { server_name _; # Include available locations - include /etc/yggbro/nginx/texty.org.ua/yggbro/texty.org.ua/locations.conf; + include /etc/yggbro/nginx/texty.org.ua/yggbro/texty.org.ua/location.conf; }