diff options
| -rw-r--r-- | roles/cgit/files/cgit.httpd.conf | 2 | ||||
| -rw-r--r-- | roles/cgit/templates/cgitrepos | 1 | ||||
| -rw-r--r-- | roles/cgit/templates/vhost.conf | 1 | ||||
| -rw-r--r-- | roles/local_deploy/files/ansible_run.sh | 2 | ||||
| -rw-r--r-- | roles/local_deploy/files/ansible_run.sudoers | 2 | ||||
| -rw-r--r-- | roles/local_deploy/files/extract_wrapper.sh | 1 | ||||
| -rw-r--r-- | roles/local_deploy/files/post-receive.private.sh | 1 | ||||
| -rw-r--r-- | roles/local_deploy/files/post-receive.public.sh | 1 | ||||
| -rw-r--r-- | roles/local_deploy/templates/extract.sudoers | 1 | ||||
| -rw-r--r-- | roles/mariadb/templates/custom.cnf | 1 | ||||
| -rw-r--r-- | roles/mediawiki/templates/wiki.conf | 1 |
11 files changed, 13 insertions, 1 deletions
diff --git a/roles/cgit/files/cgit.httpd.conf b/roles/cgit/files/cgit.httpd.conf index f389f2f..a88c2ba 100644 --- a/roles/cgit/files/cgit.httpd.conf +++ b/roles/cgit/files/cgit.httpd.conf @@ -1,4 +1,4 @@ - +# File managed by ansible <Directory "/usr/share/cgit"> Require all granted </Directory> diff --git a/roles/cgit/templates/cgitrepos b/roles/cgit/templates/cgitrepos index f3fac9a..9d9c4bb 100644 --- a/roles/cgit/templates/cgitrepos +++ b/roles/cgit/templates/cgitrepos @@ -1,3 +1,4 @@ +# {{ ansible_managed }} {% if git_repositories is defined %} {% for repo in git_repositories %} {% if not repo.private is defined or not repo.private %} diff --git a/roles/cgit/templates/vhost.conf b/roles/cgit/templates/vhost.conf index 908c21f..8b26d0b 100644 --- a/roles/cgit/templates/vhost.conf +++ b/roles/cgit/templates/vhost.conf @@ -1,3 +1,4 @@ +# {{ ansible_managed }} {% for i in '80', '443' %} <VirtualHost *:{{ i }}> diff --git a/roles/local_deploy/files/ansible_run.sh b/roles/local_deploy/files/ansible_run.sh index 7a40d0b..4e43f93 100644 --- a/roles/local_deploy/files/ansible_run.sh +++ b/roles/local_deploy/files/ansible_run.sh @@ -1,4 +1,6 @@ #!/bin/sh +# script managed by ansible + cd /etc/ansible for i in local $(hostname -s) $(hostname -f); do FILE=playbooks/${i}.yml diff --git a/roles/local_deploy/files/ansible_run.sudoers b/roles/local_deploy/files/ansible_run.sudoers index 71d226c..101cc19 100644 --- a/roles/local_deploy/files/ansible_run.sudoers +++ b/roles/local_deploy/files/ansible_run.sudoers @@ -1,2 +1,4 @@ +# file managed by ansible + Defaults:%admins !requiretty %admins ALL=(ALL) NOPASSWD: /usr/local/bin/ansible_run.sh diff --git a/roles/local_deploy/files/extract_wrapper.sh b/roles/local_deploy/files/extract_wrapper.sh index 240fb71..2d30a13 100644 --- a/roles/local_deploy/files/extract_wrapper.sh +++ b/roles/local_deploy/files/extract_wrapper.sh @@ -1,4 +1,5 @@ #!/bin/bash +# script managed by ansible export GIT_DIR=$1 GIT_WORK_TREE=/etc/ansible/ git checkout -q -f diff --git a/roles/local_deploy/files/post-receive.private.sh b/roles/local_deploy/files/post-receive.private.sh index 8d416ca..fd87747 100644 --- a/roles/local_deploy/files/post-receive.private.sh +++ b/roles/local_deploy/files/post-receive.private.sh @@ -1,2 +1,3 @@ #!/bin/sh +# script managed by ansible sudo /usr/local/bin/extract_wrapper.sh $(readlink -e $GIT_DIR) diff --git a/roles/local_deploy/files/post-receive.public.sh b/roles/local_deploy/files/post-receive.public.sh index 04d2830..483db48 100644 --- a/roles/local_deploy/files/post-receive.public.sh +++ b/roles/local_deploy/files/post-receive.public.sh @@ -1,4 +1,5 @@ #!/bin/sh +# script managed by ansible sudo /usr/local/bin/extract_wrapper.sh $(readlink -e $GIT_DIR) #GIT_WORK_TREE=/etc/ansible/ git checkout -q -f # run ansible diff --git a/roles/local_deploy/templates/extract.sudoers b/roles/local_deploy/templates/extract.sudoers index 37cda43..2fc3e73 100644 --- a/roles/local_deploy/templates/extract.sudoers +++ b/roles/local_deploy/templates/extract.sudoers @@ -1 +1,2 @@ +# {{ ansible_managed }} %admins ALL=(ALL) NOPASSWD: /usr/local/bin/extract_wrapper.sh {{ git_repositories_dir }}/{{ item }} diff --git a/roles/mariadb/templates/custom.cnf b/roles/mariadb/templates/custom.cnf index 258f81e..bbdfc4f 100644 --- a/roles/mariadb/templates/custom.cnf +++ b/roles/mariadb/templates/custom.cnf @@ -1,3 +1,4 @@ +# {{ ansible_managed }} [mysqld] bind-address = 127.0.0.1 diff --git a/roles/mediawiki/templates/wiki.conf b/roles/mediawiki/templates/wiki.conf index cc94ff6..2960ebc 100644 --- a/roles/mediawiki/templates/wiki.conf +++ b/roles/mediawiki/templates/wiki.conf @@ -1,3 +1,4 @@ +# {{ ansible_managed }} Alias /wiki/ /var/www/mediawiki/mediawiki-{{ version }}/ <Directory "/var/www/mediawiki/mediawiki-{{ version }}"> Order deny,allow |