merged

5 files changed, 196 insertions, 11 deletions

diff --git a/roles/nodejs/defaults/main.yml b/roles/nodejs/defaults/main.yml
new file mode 100644
index 0000000..f767b18
--- /dev/null
+++ b/roles/nodejs/defaults/main.yml
@@ -0,0 +1,166 @@
+nodesj_present:
+  - node-abbrev
+  - node-agent-base
+  - node-ajv
+  - node-ansi
+  - node-ansi-regex
+  - node-ansi-styles
+  - node-ansistyles
+  - node-aproba
+  - node-archy
+  - node-are-we-there-yet
+  - node-asap
+  - node-asn1
+  - node-assert-plus
+  - node-asynckit
+  - node-balanced-match
+  - node-bcrypt-pbkdf
+  - node-brace-expansion
+  - node-builtins
+  - node-cacache
+  - node-caseless
+  - node-chalk
+  - node-chownr
+  - node-clone
+  - node-color-convert
+  - node-color-name
+  - node-colors
+  - node-columnify
+  - node-combined-stream
+  - node-concat-map
+  - node-console-control-strings
+  - node-copy-concurrently
+  - node-core-util-is
+  - node-dashdash
+  - node-debug
+  - node-defaults
+  - node-delayed-stream
+  - node-delegates
+  - node-depd
+  - node-ecc-jsbn
+  - node-encoding
+  - node-err-code
+  - node-escape-string-regexp
+  - node-extend
+  - node-extsprintf
+  - node-fast-deep-equal
+  - node-forever-agent
+  - node-form-data
+  - node-fs-write-stream-atomic
+  - node-fs.realpath
+  - node-function-bind
+  - node-gauge
+  - node-getpass
+  - node-glob
+  - node-graceful-fs
+  - node-gyp
+  - node-har-schema
+  - node-har-validator
+  - node-has-flag
+  - node-has-unicode
+  - node-hosted-git-info
+  - node-http-signature
+  - node-https-proxy-agent
+  - node-iconv-lite
+  - node-iferr
+  - node-imurmurhash
+  - node-indent-string
+  - node-inflight
+  - node-inherits
+  - node-ini
+  - node-ip
+  - node-ip-regex
+  - node-is-typedarray
+  - node-isarray
+  - node-isexe
+  - node-isstream
+  - node-jsbn
+  - node-json-parse-better-errors
+  - node-json-schema
+  - node-json-schema-traverse
+  - node-json-stable-stringify
+  - node-json-stringify-safe
+  - node-jsonify
+  - node-jsonparse
+  - node-jsonstream
+  - node-jsprim
+  - node-leven
+  - node-lockfile
+  - node-lru-cache
+  - node-mime
+  - node-mime-types
+  - node-minimatch
+  - node-mkdirp
+  - node-move-concurrently
+  - node-ms
+  - node-mute-stream
+  - node-nopt
+  - node-normalize-package-data
+  - node-npm-bundled
+  - node-npm-package-arg
+  - node-npmlog
+  - node-number-is-nan
+  - node-oauth-sign
+  - node-object-assign
+  - node-once
+  - node-opener
+  - node-osenv
+  - node-p-map
+  - node-path-is-absolute
+  - node-performance-now
+  - node-process-nextick-args
+  - node-promise-inflight
+  - node-promise-retry
+  - node-promzard
+  - node-psl
+  - node-puka
+  - node-punycode
+  - node-qs
+  - node-read
+  - node-read-package-json
+  - node-readable-stream
+  - node-request
+  - node-resolve
+  - node-resolve-from
+  - node-retry
+  - node-rimraf
+  - node-run-queue
+  - node-safe-buffer
+  - node-semver
+  - node-set-blocking
+  - node-signal-exit
+  - node-slash
+  - node-spdx-correct
+  - node-spdx-exceptions
+  - node-spdx-expression-parse
+  - node-spdx-license-ids
+  - node-sshpk
+  - node-ssri
+  - node-string-decoder
+  - node-string-width
+  - node-strip-ansi
+  - node-supports-color
+  - node-tar
+  - node-text-table
+  - node-through
+  - node-tough-cookie
+  - node-tunnel-agent
+  - node-tweetnacl
+  - node-typedarray-to-buffer
+  - node-unique-filename
+  - node-universalify
+  - node-uri-js
+  - node-util-deprecate
+  - node-uuid
+  - node-validate-npm-package-license
+  - node-validate-npm-package-name
+  - node-verror
+  - node-wcwidth.js
+  - node-which
+  - node-wide-align
+  - node-wrappy
+  - node-write-file-atomic
+  - node-yallist
+  - nodejs-doc
+
+nodejs_absent: []
diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml
new file mode 100644
index 0000000..4a757a3
--- /dev/null
+++ b/roles/nodejs/tasks/main.yml
@@ -0,0 +1,10 @@
+- name: uninstall nodejs packages
+  apt:
+    name: '{{ nodejs_absent }}'
+    state: absent
+    purge: yes
+
+- name: install nodejs packages
+  apt:
+    name: '{{ nodejs_present }}'
+    install_recommends: 'no'
diff --git a/roles/packages/defaults/main.yml b/roles/packages/defaults/main.yml
index 339d5f8..db24c48 100644
--- a/roles/packages/defaults/main.yml
+++ b/roles/packages/defaults/main.yml
@@ -1,22 +1,23 @@
 default_packages_present_all:
-  - vim
-  - zsh
+  - bc
+  - curl
   - git
+  - golang
   - htop
-  - curl
   - lynx
-  - nginx-extras
+  - make
+  - needrestart
+  - nginx-light
   - nodejs
   - npm
   - redis-tools
   - rsync
   - screen
-  - whois
-  - make
-  - golang
-  - rsync
-  - needrestart
   - unzip
+  - vim
+  - whois
+  - xz-utils
+  - zsh
 
     #  - imagemagick
     #  - imagemagick-6.q16
diff --git a/roles/php/tasks/main.yml b/roles/php/tasks/main.yml
index b11e694..0ae202d 100644
--- a/roles/php/tasks/main.yml
+++ b/roles/php/tasks/main.yml
@@ -1,10 +1,10 @@
-- name: uninstall packages
+- name: uninstall php packages
   apt:
     name: '{{ php_absent }}'
     state: absent
     purge: yes
 
-- name: install packages
+- name: install php packages
   apt:
     name: '{{ php_present }}'
     install_recommends: 'no'
diff --git a/site.yml b/site.yml
index 9505c1d..814e85c 100644
--- a/site.yml
+++ b/site.yml
@@ -92,6 +92,14 @@
     - php
     - common
 
+- name: nodejs
+  hosts: all
+  roles:
+    - php
+  tags:
+    - nodejs
+    - applications
+
 # ------------------------------------------------------------
 
 - name: ssh