From e0309cd5d4cc9656b7c49cb3275ff4be2c74c17c Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 21 May 2018 23:28:21 +0000 Subject: [PATCH] tweaks to get mongodb autotarting --- roles/mongodb/tasks/main.yml | 18 +----------------- roles/mongodb/templates/mongod.conf | 6 +++--- roles/mongodb/templates/mongodb | 1 - roles/mongodb/templates/mongodb.service | 2 +- roles/mongodb/templates/mongodb~HEAD | 1 - roles/sugarizer/defaults/main.yml | 3 +-- roles/sugarizer/meta/main.yml | 2 +- roles/sugarizer/tasks/main.yml | 6 +++--- roles/sugarizer/templates/sugarizer.conf | 4 ++-- vars/default_vars.yml | 1 + 10 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 roles/mongodb/templates/mongodb delete mode 100644 roles/mongodb/templates/mongodb~HEAD diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index b007bd357..81a4864c9 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -17,7 +17,7 @@ - { path: '/library/dbdata/mongodb' } - { path: '/var/log/mongodb' } -- name: Create systemd files +- name: Move required files template: src={{ item.src }} dest={{ item.dest }} owner=root @@ -25,9 +25,7 @@ mode=0644 with_items: - { src: 'mongodb.service' , dest: '/etc/systemd/system/' } - - { src: 'mongodb' , dest: '/etc/sysconfig/'} - { src: 'mongod.conf' , dest: '/etc/mongod.conf'} - - { src: 'mongod.conf' , dest: '/etc/mongodb.conf'} - name: enable services service: name={{ item.name }} @@ -45,20 +43,6 @@ - { name: mongodb } when: not mongodb_enabled -# See https://github.com/iiab/iiab/issues/254 for other attempts to eliminate -# these 256MB files. Brute Force Idea: rm /var/lib/mongodb/journal/prealloc.* -- name: find /var/lib/mongodb/prealloc.* files to delete - find: - paths: /var/lib/mongodb/journal - patterns: prealloc.* - register: files_to_delete - -- name: delete prealloc files - file: - path: "{{ item.path }}" - state: absent - with_items: "{{ files_to_delete.files }}" - - name: add mongodb to service list ini_file: dest="{{ service_filelist }}" section=mongodb diff --git a/roles/mongodb/templates/mongod.conf b/roles/mongodb/templates/mongod.conf index 1b82f23b8..4d6b2a9e5 100644 --- a/roles/mongodb/templates/mongod.conf +++ b/roles/mongodb/templates/mongod.conf @@ -18,13 +18,13 @@ pidfilepath = /var/run/mongodb/mongod.pid logpath = /var/log/mongodb/mongod.log # Alternative directory for UNIX domain sockets (defaults to /tmp) -unixSocketPrefix = /var/run/mongodb +# unixSocketPrefix = /var/run/mongodb # Directory for datafiles (defaults to /data/db/) dbpath = /library/dbdata/mongodb # Enable/Disable journaling (journaling is on by default for 64 bit) -#journal = true +journal = true #nojournal = true @@ -37,7 +37,7 @@ dbpath = /library/dbdata/mongodb #verbose = v # Max number of simultaneous connections (1000000 by default) -#maxConns = 1000000 +maxConns = 1000 # Log to system's syslog facility instead of file or stdout (false by default) #syslog = true diff --git a/roles/mongodb/templates/mongodb b/roles/mongodb/templates/mongodb deleted file mode 100644 index eadac0d28..000000000 --- a/roles/mongodb/templates/mongodb +++ /dev/null @@ -1 +0,0 @@ -OPTIONS=' -f /etc/mongod.conf ' diff --git a/roles/mongodb/templates/mongodb.service b/roles/mongodb/templates/mongodb.service index 313ae15c0..49133d7e6 100644 --- a/roles/mongodb/templates/mongodb.service +++ b/roles/mongodb/templates/mongodb.service @@ -7,7 +7,7 @@ Type=forking User=mongodb Group=mongodb PIDFile=/var/run/mongodb/mongod.pid -EnvironmentFile=/etc/sysconfig/mongodb +#EnvironmentFile=/etc/sysconfig/mongodb ExecStart=/usr/bin/mongod -f /etc/mongod.conf [Install] diff --git a/roles/mongodb/templates/mongodb~HEAD b/roles/mongodb/templates/mongodb~HEAD deleted file mode 100644 index eadac0d28..000000000 --- a/roles/mongodb/templates/mongodb~HEAD +++ /dev/null @@ -1 +0,0 @@ -OPTIONS=' -f /etc/mongod.conf ' diff --git a/roles/sugarizer/defaults/main.yml b/roles/sugarizer/defaults/main.yml index 18349676b..7baf488d2 100644 --- a/roles/sugarizer/defaults/main.yml +++ b/roles/sugarizer/defaults/main.yml @@ -1,7 +1,6 @@ sugarizer_install: True sugarizer_enabled: False -sugarizer_location: '{{ doc_root }}' -sugarizer_port: 8089 +sugarizer_location: /opt/iiab sugarizer_version: 'sugarizer-1.0' sugarizer_server_version: 'sugarizer-server-1.0' npm_exists: False diff --git a/roles/sugarizer/meta/main.yml b/roles/sugarizer/meta/main.yml index e3fcddc52..1ac8adeed 100644 --- a/roles/sugarizer/meta/main.yml +++ b/roles/sugarizer/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -# - { role: mongodb, tags: ['generic','mongodb'], when: sugarizer_install } + - { role: mongodb, tags: ['generic','mongodb'], when: sugarizer_install } diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 44c59ff52..17b5c366b 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -5,7 +5,7 @@ timeout: "{{ download_timeout }}" when: internet_available -- name: Untar to /library/www/html/{{ sugarizer_version }} +- name: Untar to {{ sugarizer_version }} unarchive: src: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" dest: "{{ sugarizer_location }}" @@ -20,7 +20,7 @@ timeout: "{{ download_timeout }}" when: internet_available -- name: Untar to /library/www/html/{{ sugarizer_version }} +- name: Untar to /{{ sugarizer_version }} unarchive: src: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" dest: "{{ sugarizer_location }}" @@ -94,7 +94,7 @@ with_items: - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'} - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini' } - - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' } + - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' } - name: Create the symlink enabling the rewrite file: src=/etc/apache2/sites-available/sugarizer.conf diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf index 19bb98363..72dcf33e4 100644 --- a/roles/sugarizer/templates/sugarizer.conf +++ b/roles/sugarizer/templates/sugarizer.conf @@ -1,3 +1,3 @@ -RewriteRule ^/sugarizer(.*)$ http://localhost:{{ sugaarizer_port }}/sugarizer$1 [P,L] -ProxyPassReverse /sugarizer http://localhost:{{ sugarizer_port }}/sugarizer +RewriteRule ^/sugarizer(.*)$ http://localhost:"{{ sugarizer_port }}/sugarizer$1" [P,L] +ProxyPassReverse /sugarizer http://localhost:"{{ sugarizer_port }}/sugarizer" ProxyRequests Off diff --git a/vars/default_vars.yml b/vars/default_vars.yml index c02f7254c..542fc2ad6 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -320,6 +320,7 @@ pathagar_enabled: False # Sugarizer sugarizer_install: True sugarizer_enabled: False +sugarizer_port: 8089 # 8-MGMT-TOOLS