diff options
| -rw-r--r-- | INSTALLING.rst | 9 | ||||
| -rw-r--r-- | ansible/roles/web/tasks/main.yml | 21 |
2 files changed, 9 insertions, 21 deletions
diff --git a/INSTALLING.rst b/INSTALLING.rst index c645ff9..61e9147 100644 --- a/INSTALLING.rst +++ b/INSTALLING.rst @@ -21,11 +21,11 @@ Quick-install As root: -:: +:: ### Set to your regular username, obviously # YOURUSER=kly - # apt-get install sudo + # apt-get install sudo git # echo ${YOURUSER} ALL=NOPASSWD: ALL >> /etc/sudoers # echo deb http://http.debian.net/debian jessie-backports main non-free contrib > /etc/apt/sources.list.d/bp.list # apt-get update @@ -39,10 +39,6 @@ As ``$YOURUSER``:: Then visit http://ip-your-boxen/ -Manualy import the database for now:: - - psql -h localhost -d nms -U nms -f /opt/gondul/build/schema.sql - Setting up your network... -------------------------- @@ -117,4 +113,3 @@ broken: - Distribution of configuration (config is being re-implemented) - Various test-cases (They are already there, just need to be fiddled with) - Graphite / Grafana. Most likely, this will be an external "optional dependency" - diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index 01bf17f..d05c6db 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -51,12 +51,6 @@ name: "varnish" state: present -- name: Copy varnish config - copy: - dest: /etc/varnish/default.vcl - src: varnish.vcl - notify: restart varnish - - name: Ensure folder varnish.service.d exists file: path=/etc/systemd/system/varnish.service.d/ state=directory mode=0755 @@ -66,7 +60,12 @@ src: varnish.service notify: - reload systemd - - restart varnish + +- name: Copy varnish config + copy: + dest: /etc/varnish/default.vcl + src: varnish.vcl + notify: restart varnish - name: Make apache listen on port 8080 lineinfile: dest=/etc/apache2/ports.conf regexp="^Listen 80" line="Listen 8080" state=present @@ -80,18 +79,12 @@ - name: Enable gondul-config copy: dest: /etc/apache2/sites-enabled/gondul.conf - src: apache-virtualhost + src: apache-virtualhost.conf notify: restart apache - command: a2dissite 000-default ignore_errors: true notify: restart apache -- name: Enable gondul-config - copy: - dest: /etc/apache2/sites-enabled/ - src: gondul.conf - notify: restart apache - - cpanm: name: AnyEvent::InfluxDB |