diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 76ded5ec10..746ecc8a79 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -21,7 +21,6 @@ - collectd/base - collectd/server - sudo - - awstats - web-data-analysis - role: keytab/service owner_user: apache diff --git a/roles/awstats/README b/roles/awstats/README deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/roles/awstats/tasks/main.yml b/roles/awstats/tasks/main.yml deleted file mode 100644 index ae5be08d6e..0000000000 --- a/roles/awstats/tasks/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- name: install awstats package - package: state=present name=awstats - tags: - - packages - - awstats - -- name: make the awstats directory - file: path=/var/www/html/awstats-reports state=directory - tags: - - awstats - -- name: ensure messaging script is installed - import_role: name=fedora-messaging-utils - tags: - - awstats - -- name: awstats proxy merge script (log01) - copy: src=combineHttpLogs.sh dest=/usr/local/bin/ mode=0755 - tags: - - config - - awstats - -- name: awstats daily cron job to merge old logs - copy: src=combineHttp.cron dest=/etc/cron.d/ mode=0644 - tags: - - cron - - awstats - -#- name: set up http configs for awstats on dataserver - diff --git a/roles/awstats/files/combineHttp.cron b/roles/web-data-analysis/files/combineHttp.cron similarity index 100% rename from roles/awstats/files/combineHttp.cron rename to roles/web-data-analysis/files/combineHttp.cron diff --git a/roles/awstats/files/combineHttpLogs.sh b/roles/web-data-analysis/files/combineHttpLogs.sh similarity index 100% rename from roles/awstats/files/combineHttpLogs.sh rename to roles/web-data-analysis/files/combineHttpLogs.sh diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index 955c91d820..bd1379b321 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -184,3 +184,26 @@ tags: - web-data - cron + +- name: install awstats package + package: state=present name=awstats + tags: + - packages + - web-data + +- name: make the awstats directory + file: path=/var/www/html/awstats-reports state=directory + tags: + - web-data + +- name: proxy log merge script (log01) + copy: src=combineHttpLogs.sh dest=/usr/local/bin/ mode=0755 + tags: + - config + - web-data + +- name: daily cron job to merge old logs + copy: src=combineHttp.cron dest=/etc/cron.d/ mode=0644 + tags: + - cron + - web-data