From 0fffc0c2b7b5da7ea9e2ebd56f07853ea7772b67 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Mon, 20 Jun 2016 10:38:04 +0200
Subject: [PATCH] sources: Symlinks to sources
---
playbooks/orion.yml | 2 +-
roles/sources/tasks/main.yml | 9 +++++++++
roles/sources/templates/nginx.d.conf.j2 | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/playbooks/orion.yml b/playbooks/orion.yml
index 0d1e381bc..f61f8abb9 100644
--- a/playbooks/orion.yml
+++ b/playbooks/orion.yml
@@ -16,4 +16,4 @@
- { role: dbscripts, repos_domain: "repos.archlinux.org", svntogit_repos: "/srv/svntogit/repos", tags: ['dbscripts', 'archusers'] }
- { role: sudo, tags: ['sudo', 'archusers'] }
- { role: archweb, archweb_home: "/srv/http/archweb", tags: ['archweb'] }
- - { role: sources, sources_domain: "sources.archlinux.org", tags: ['sources'] }
+ - { role: sources, sources_domain: "sources.archlinux.org", sources_dir: "/srv/sources", tags: ['sources'] }
diff --git a/roles/sources/tasks/main.yml b/roles/sources/tasks/main.yml
index 6bb046372..b26661a53 100644
--- a/roles/sources/tasks/main.yml
+++ b/roles/sources/tasks/main.yml
@@ -7,3 +7,12 @@
- name: make nginx log dir
file: path=/var/log/nginx/{{ sources_domain }} state=directory owner=http group=log mode=755
+
+- name: make sources dir
+ file: path={{ sources_dir }} state=directory owner=root group=root mode=755
+
+- name: make symlink to repo sources
+ file: path={{ sources_dir }}/sources src=/srv/ftp/sources state=link owner=root group=root mode=755
+
+- name: make symlink to other sources
+ file: path={{ sources_dir }}/other src=/srv/ftp/other state=link owner=root group=root mode=755
diff --git a/roles/sources/templates/nginx.d.conf.j2 b/roles/sources/templates/nginx.d.conf.j2
index c885d61dd..3738d694a 100644
--- a/roles/sources/templates/nginx.d.conf.j2
+++ b/roles/sources/templates/nginx.d.conf.j2
@@ -26,7 +26,7 @@ server {
ssl_trusted_certificate /etc/letsencrypt/live/{{ sources_domain }}/chain.pem;
include snippets/sslsettings.conf;
- root /srv/ftp/sources;
+ root {{ sources_dir }};
autoindex on;
}
--
GitLab