Parcourir la source

Merge branch 'master' of git.thengo.net:ka/ansible-roles

master
Parent
révision
4f79945430
5 fichiers modifiés avec 12 ajouts et 2 suppressions
  1. +8
    -0
      .gitmodules
  2. +1
    -1
      desktop
  3. +1
    -0
      nginx
  4. +1
    -0
      roles/nginx
  5. +1
    -1
      screensaver

+ 8
- 0
.gitmodules Voir le fichier

@@ -149,3 +149,11 @@
[submodule "postgresql"]
path = postgresql
url = ../ansible-role-postgresql.git
[submodule "nginx"]
path = nginx
url = ../ansible-role-nginx.git
branch = master
[submodule "roles/nginx"]
path = roles/nginx
url = ../ansible-role-nginx.git
branch = master

+ 1
- 1
desktop

@@ -1 +1 @@
Subproject commit 758d88d8206aa0cee2c2cb43f020fffac882bda1
Subproject commit 8ba5477abc849a910b9a7221a113765104fab8e0

+ 1
- 0
nginx

@@ -0,0 +1 @@
Subproject commit f44ea9ebdcf9d2600ef124125a6bff9925fc5f4b

+ 1
- 0
roles/nginx

@@ -0,0 +1 @@
Subproject commit f44ea9ebdcf9d2600ef124125a6bff9925fc5f4b

+ 1
- 1
screensaver

@@ -1 +1 @@
Subproject commit 982308caed9d96176726b6d3df0e8790e87aa5b0
Subproject commit 9e49955cd1af2f60f83a6d3073d1587fe1c52516

Chargement…
Annuler
Enregistrer