Merge branch 'master' of github.com:almet/infra

lhirlimann · Apr 17, 2016 · cc58321 · cc58321
2 parents 956a5f3 + 018cf1e
commit cc58321
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 42 deletions.
diff --git a/README.rst → README.md b/README.rst → README.md
@@ -1,5 +1,7 @@
-How this works?
-###############
+# How this works?
+
+You can review the list of new services and planned migrations [on our issue
+tracker](https://git.notmyidea.org/almet/infra/issues)
 
 If you want to add a new webby thing to this server, you will need to:
 
@@ -11,18 +13,16 @@ If you want to add a new webby thing to this server, you will need to:
 3. If you need to run another dedicated server, you can do so, please make it run
    at startup. For this, have a look at our supervisor section.
 
-Commands needed to add a new service to haproxy + nginx
-=======================================================
+## Commands needed to add a new service to haproxy + nginx
 
 If you want to add a new HTTP service, the best way is usually to have it
 running behind NGINX. To do so, you need to first create a file next to the
 other ones in ``/nginx`` and then create a symbolic link to the configuration
-on the machine::
+on the machine:
 
     $ ln -s nginx/domain.tld /etc/nginx/sites-enabled/domain.tld
 
-How to run a service at startup
-===============================
+## How to run a service at startup
 
 You need to create a file next to the other ones in ``/supervisor``. Have a
 look at the options by yourself.
@@ -35,8 +35,7 @@ Then, restart check that everything works as expected::
 
     $ sudo supervisorctl
 
-How to enable SSL via Let's Encrypt
-===================================
+## How to enable SSL via Let's Encrypt
 
 HAProxy serves as a termination endpoint in this infrastructure. It means that
 all the SSL magic is offloaded when in HAProxy.
@@ -47,8 +46,7 @@ SSL for a new domain.
 The first thing to do is to add you domain in a new file under ``letsencrypt/domain.tld.sh``.
 Then, you can run this script and after that, run the ``letsencrypt/install-certs.sh`` script.
 
-How to run a TOR hidden service
-===============================
+## How to run a TOR hidden service
 
 To run a service behind a TOR hiddent service, you need to:
 

diff --git a/SERVICES.md b/SERVICES.md