From 4ee3d1a2d5d6ea2785fc331d508ca7f569bbb4eb Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 30 Nov 2015 19:14:35 +0200
Subject: [PATCH] Rename variable git_directory to cgit_directory for
consistency.
---
README.rst | 2 +-
defaults/main.yml | 3 ++-
tasks/main.yml | 4 ++--
templates/cgit.j2 | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/README.rst b/README.rst
index b48b301..d9a3ca1 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ Role Variables
--------------
::
- git_directory: /srv/git #The directory to be created and used for all git repositories served.
+ cgit_directory: /srv/git #The directory to be created and used for all git repositories served.
Dependencies
------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 3508c03..b9cbc05 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
---
# defaults file for ansible-cgit
-git_directory: /srv/git
+
+cgit_directory: /srv/git
diff --git a/tasks/main.yml b/tasks/main.yml
index 3ffec81..fae2ec5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -43,7 +43,7 @@
- name: Create git repostories directory
file:
- path: '{{ git_directory }}'
+ path: '{{ cgit_directory }}'
owner: root
group: root
mode: '0777'
@@ -65,7 +65,7 @@
regexp: '{{ item.regexp|default(omit) }}'
insertbefore: '{{ item.insertbefore|default(omit) }}'
with_items:
- - line: 'scan-path={{ git_directory }}'
+ - line: 'scan-path={{ cgit_directory }}'
regexp: 'scan-path='
- line: 'css=/cgit/css/cgit.css'
regexp: '^css='
diff --git a/templates/cgit.j2 b/templates/cgit.j2
index aa8ef8a..524849f 100644
--- a/templates/cgit.j2
+++ b/templates/cgit.j2
@@ -1,3 +1,3 @@
#!/bin/sh -e
-cd {{ git_directory|dirname }}
-tar -cf /var/backups/git.tar.gz {{ git_directory|basename }}
+cd {{ cgit_directory|dirname }}
+tar -cf /var/backups/git.tar.gz {{ cgit_directory|basename }}
--
GitLab