diff --git a/master.yml b/master.yml index b8dbeda506..b108308519 100644 --- a/master.yml +++ b/master.yml @@ -146,7 +146,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/modernpaste.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/modularity.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/piwik.fedorainfracloud.org.yml #- import_playbook: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml diff --git a/playbooks/hosts/piwik.fedorainfracloud.org.yml b/playbooks/hosts/piwik.fedorainfracloud.org.yml deleted file mode 100644 index bf2b939887..0000000000 --- a/playbooks/hosts/piwik.fedorainfracloud.org.yml +++ /dev/null @@ -1,44 +0,0 @@ -- name: check/create instance - hosts: piwik.fedorainfracloud.org - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/web/infra/ansible/vars/fedora-cloud.yml - - /srv/private/ansible/files/openstack/passwords.yml - - tasks: - - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: setup all the things - hosts: piwik.fedorainfracloud.org - gather_facts: True - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/private/ansible/files/openstack/passwords.yml - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" - - roles: - - basessh - - sudo - - hosts - - apache - - base - - piwik - - nagios_client - - pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - tasks: - - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - - name: set hostname (required by some services, at least postfix need it) - hostname: name="{{inventory_hostname}}" diff --git a/roles/piwik/files/my.cnf.data-analysis01 b/roles/piwik/files/my.cnf.data-analysis01 deleted file mode 100644 index 5b0abb9a7c..0000000000 --- a/roles/piwik/files/my.cnf.data-analysis01 +++ /dev/null @@ -1,19 +0,0 @@ -[mysqld] -datadir=/srv/mysql -socket=/srv/mysql/mysql.sock -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 -# Settings user and group are ignored when systemd is used. -# If you need to run mysqld under a different user or group, -# customize your systemd unit file for mariadb according to the -# instructions in http://fedoraproject.org/wiki/Systemd - -[mysqld_safe] -log-error=/var/log/mariadb/mariadb.log -pid-file=/var/run/mariadb/mariadb.pid - -# -# include all files from the config directory -# -!includedir /etc/my.cnf.d - diff --git a/roles/piwik/tasks/main.yml b/roles/piwik/tasks/main.yml deleted file mode 100644 index f63dfeb930..0000000000 --- a/roles/piwik/tasks/main.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- name: install piwik package - dnf: state=present name={{ item }} - with_items: - - piwik - - mod_ssl - tags: - - packages - - piwik - -- name: set up http configs for piwik - template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} - owner=root group=root mode=0644 - with_items: - - piwik-httpd.conf - tags: - - files - - config - - piwik - notify: - - restart apache - -- name: Install the SSL cert so that we can use https - copy: > - src={{ private }}/files/httpd/{{ item }} dest=/etc/pki/tls/certs/{{ item }} - owner=root group=root mode=0600 - with_items: - - piwik.fedorainfracloud.org.cert - - piwik.fedorainfracloud.org.key - - piwik.fedorainfracloud.org.intermediate.cert - tags: - - config - - piwik - -- name: Create directory for db backup - file: path=/srv/dbdump state=directory - -- name: database dump cron - cron: name=dbdump special_time=daily job="mysqldump --skip-extended-insert --single-transaction piwik | gzip > /srv/dbdump/piwik.sql.gz" diff --git a/roles/piwik/templates/piwik-httpd.conf b/roles/piwik/templates/piwik-httpd.conf deleted file mode 100644 index 881c509e30..0000000000 --- a/roles/piwik/templates/piwik-httpd.conf +++ /dev/null @@ -1,23 +0,0 @@ - - Require all granted - - - - ServerName piwik.fedorainfracloud.org - Redirect permanent / https://piwik.fedorainfracloud.org/piwik - - - - ServerName piwik.fedorainfracloud.org - - SSLEngine on - SSLProtocol {{ ssl_protocols }} - SSLCipherSuite {{ ssl_ciphers }} - Header always add Strict-Transport-Security "max-age=15768000; includeSubDomains; preload" - - SSLCertificateFile /etc/pki/tls/certs/piwik.fedorainfracloud.org.cert - SSLCertificateChainFile /etc/pki/tls/certs/piwik.fedorainfracloud.org.intermediate.cert - SSLCertificateKeyFile /etc/pki/tls/certs/piwik.fedorainfracloud.org.key - - Alias /piwik /srv/piwik -