From 2bd0f7868e0ccf1303e727851f6eaa1059d0582b Mon Sep 17 00:00:00 2001 From: Nienke Dekker Date: Tue, 21 Jun 2016 11:19:44 +0200 Subject: [PATCH 1/7] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9458d88..1aa9a63 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,11 @@ Zer.ooo aims to simplify the management of your OpenVPN servers and certificates ## How do I use it? -If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server (a how-to should follow shortly). +If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server. Vagrant and Virtualbox are required here. + +1. Run git clone in your local folder +2. Run vagrant up +3. Run vagrant provision +4. Run ./bin/setup_web +5. Go to localhost:8888 and follow the installation instructions. From ff00d989e49df3ef17d66ae805ac26745c32f164 Mon Sep 17 00:00:00 2001 From: Nienke Dekker Date: Tue, 21 Jun 2016 11:20:13 +0200 Subject: [PATCH 2/7] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1aa9a63..69fec92 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Zer.ooo aims to simplify the management of your OpenVPN servers and certificates If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server. Vagrant and Virtualbox are required here. -1. Run git clone in your local folder -2. Run vagrant up -3. Run vagrant provision -4. Run ./bin/setup_web +1. Run `git clone` in your local folder +2. Run `vagrant up` +3. Run `vagrant provision` +4. Run `./bin/setup_web` 5. Go to localhost:8888 and follow the installation instructions. From 22b48a1696f2f04c5cbe711da61ff07231667380 Mon Sep 17 00:00:00 2001 From: Nienke Dekker Date: Tue, 21 Jun 2016 11:20:46 +0200 Subject: [PATCH 3/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69fec92..0e3e5df 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Zer.ooo aims to simplify the management of your OpenVPN servers and certificates ## How do I use it? -If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server. Vagrant and Virtualbox are required here. +If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server (Vagrant and Virtualbox required). 1. Run `git clone` in your local folder 2. Run `vagrant up` From 050034c82bd735eb6e2e5651de3d5ce3831c27e7 Mon Sep 17 00:00:00 2001 From: Nienke Dekker Date: Tue, 21 Jun 2016 11:21:24 +0200 Subject: [PATCH 4/7] Update README.md --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 0e3e5df..cbd8f80 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,4 @@ Zer.ooo aims to simplify the management of your OpenVPN servers and certificates ## How do I use it? -If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server (Vagrant and Virtualbox required). - -1. Run `git clone` in your local folder -2. Run `vagrant up` -3. Run `vagrant provision` -4. Run `./bin/setup_web` -5. Go to localhost:8888 and follow the installation instructions. - +If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server (Vagrant and Virtualbox required). See the installation guide here: https://docs.zer.ooo/running_your_own/ From d1a106ab7d50260b874cf4f8a8141f25ec7d4475 Mon Sep 17 00:00:00 2001 From: Corne Oppelaar Date: Tue, 21 Jun 2016 12:21:54 +0200 Subject: [PATCH 5/7] fix extra space in the contributors list --- views/home.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/home.html.twig b/views/home.html.twig index c4790a4..262ea8c 100644 --- a/views/home.html.twig +++ b/views/home.html.twig @@ -40,10 +40,10 @@ {% if contributors|length > 0 %}

with the help of - {% for contributor in contributors %} - {% if loop.index0 < (loop.length - 1) and loop.index0 > 0 %}, {% elseif loop.index0 == (loop.length - 1) %} and {% endif %} + {% for contributor in contributors -%} + {%- if loop.index0 < (loop.length - 1) and loop.index0 > 0 %}, {% elseif loop.index0 == (loop.length - 1) %} and {% endif -%} {{ contributor.login }} - {% endfor %} + {%- endfor %}

{% endif %} From b14cf290499a180cef5059850d8908396cf36dab Mon Sep 17 00:00:00 2001 From: Corne Oppelaar Date: Tue, 21 Jun 2016 12:22:23 +0200 Subject: [PATCH 6/7] use correct repo --- config/app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.yml b/config/app.yml index 47490a7..a652521 100644 --- a/config/app.yml +++ b/config/app.yml @@ -6,7 +6,7 @@ core: name: "Zer.ooo" author: "EaterOfCode" sessionName: '0sess' - github-repo: 'EaterOfCode/zer.ooo' + github-repo: 'zerooo-vpn/zer.ooo' services: slim: Eater\Glim\Service\Slim user: Eater\Glim\Service\User @@ -16,4 +16,4 @@ core: ca: Eater\Glim\Service\CA server: Eater\Glim\Service\Server stash: Eater\Glim\Service\Stash - github: Eater\Glim\Service\GitHub \ No newline at end of file + github: Eater\Glim\Service\GitHub From 3eb917ed9b713ed2720924b4cfa9c751f98c4587 Mon Sep 17 00:00:00 2001 From: Corne Oppelaar Date: Wed, 22 Jun 2016 23:32:12 +0200 Subject: [PATCH 7/7] Add LICENSE --- LICENSE | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1cac867 --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright © 2016 Corné Oppelaar + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file