summaryrefslogtreecommitdiffstats
path: root/roles/planet
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2015-06-17 17:11:05 +0000
committerKevin Fenzi <kevin@scrye.com>2015-06-17 17:11:05 +0000
commit533fb0b588c45fc495ad5d28198ef7a4cb54c119 (patch)
tree2c60983f8045162393ce793ea9d68ea19947bdfc /roles/planet
parent2b43330eb623b6c8fe110d977af1aec196203063 (diff)
downloadansible-533fb0b588c45fc495ad5d28198ef7a4cb54c119.tar.gz
ansible-533fb0b588c45fc495ad5d28198ef7a4cb54c119.tar.xz
ansible-533fb0b588c45fc495ad5d28198ef7a4cb54c119.zip
Instead of making a bunch of links, put the main site at the top level.
Diffstat (limited to 'roles/planet')
-rw-r--r--roles/planet/files/people_base_config2
-rw-r--r--roles/planet/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/planet/files/people_base_config b/roles/planet/files/people_base_config
index cabefa9f5..74c1e94bd 100644
--- a/roles/planet/files/people_base_config
+++ b/roles/planet/files/people_base_config
@@ -5,7 +5,7 @@ owner_name = Fedora Admin
owner_email = admin@fedoraproject.org
cache_directory = /srv/planet/config/people/cache
template_files = /srv/planet/config/people/templates/index.html.tmpl /srv/planet/config/people/templates/rss20.xml.tmpl /srv/planet/config/people/templates/rss10.xml.tmpl /srv/planet/config/people/templates/opml.xml.tmpl /srv/planet/config/people/templates/foafroll.xml.tmpl /srv/planet/config/people/templates/atom.xml.tmpl /srv/planet/config/people/templates/heads.html.tmpl
-output_dir = /srv/planet/site/people
+output_dir = /srv/planet/people
items_per_page = 50
log_level = ERROR
date_format = %B %d, %Y %I:%M %p
diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml
index c277dcc86..8b3db3b2c 100644
--- a/roles/planet/tasks/main.yml
+++ b/roles/planet/tasks/main.yml
@@ -47,6 +47,7 @@
- name: create planet directory
file: path={{ item }} state=directory owner=planet-user group=web mode=0775
with_items:
+ - /srv/planet
- /srv/planet/site
- /srv/planet/config
@@ -63,7 +64,6 @@
file: path={{ item }} state=directory owner=planet-user group=web mode=0775
with_items:
- /etc/planet/people
- - /srv/planet/site/people
- /srv/planet/config/people
- name: base planet config files