Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3766898
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
23 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
index 2d2c730..ca8eb82 100644
--- a/roles/core/userland-software/init.sls
+++ b/roles/core/userland-software/init.sls
@@ -1,63 +1,62 @@
# -------------------------------------------------------------
# Salt — Provision software needed by other core roles
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-09
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
# Software sources
# -------------------------------------------------------------
{% if grains['os'] == 'CentOS' %}
epel-release:
pkg.installed
/etc/yum.repos.d/nasqueron.repo:
file.managed:
- source: salt://roles/core/userland-software/files/nasqueron.repo
{% endif %}
# -------------------------------------------------------------
# Shells
# -------------------------------------------------------------
shells:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- bash
- zsh
{% if grains['os'] != 'FreeBSD' %}
- tcsh
{% endif %}
{{ dirs.share }}/zsh/site-functions/_pm:
file.managed:
# At commit 683d331 - 2017-11-05
- source: https://raw.githubusercontent.com/Angelmmiguel/pm/master/zsh/_pm
- source_hash: deea33968be713cdbd8385d3a72df2dd09c444e42499531893133f009f0ce0ea
# -------------------------------------------------------------
# tmux
# -------------------------------------------------------------
tmux:
pkg.installed
/root/.tmux.conf:
file.managed:
- source: salt://roles/core/userland-software/files/tmux.conf
# -------------------------------------------------------------
# System administration utilities
# -------------------------------------------------------------
sysadmin_utilities:
pkg.installed:
- pkgs:
- tree
- wget
diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls
index 2527edd..59a571e 100644
--- a/roles/devserver/userland-software/dev.sls
+++ b/roles/devserver/userland-software/dev.sls
@@ -1,159 +1,147 @@
# -------------------------------------------------------------
# Salt — Provision dev software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-20
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import packages, packages_prefixes with context %}
# -------------------------------------------------------------
# C/C++
# -------------------------------------------------------------
devserver_software_dev_c:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.boost }}
- cmocka
- {{ packages.librabbitmq }}
# -------------------------------------------------------------
# Java
# -------------------------------------------------------------
devserver_software_dev_java:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- openjdk8
- apache-ant
- maven
# -------------------------------------------------------------
# .Net languages
# -------------------------------------------------------------
devserver_software_dev_dotnet:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- mono
# -------------------------------------------------------------
# Node
# -------------------------------------------------------------
devserver_software_dev_node:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.node }}
- npm
devserver_node_packages:
npm.installed:
- pkgs:
- bower
- browserify
- gulp
- grunt
- jsonlint
- react-tools
- require:
- pkg: devserver_software_dev_node
# -------------------------------------------------------------
# PHP
# -------------------------------------------------------------
devserver_software_dev_php:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.phpunit }}
# -------------------------------------------------------------
# Python
# -------------------------------------------------------------
devserver_software_dev_python:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
# Modern Python 3 packages
- {{ packages_prefixes.python3 }}beautifulsoup
# Legacy packages
- {{ packages_prefixes.python2 }}nltk
- {{ packages_prefixes.python2 }}numpy
- {{ packages_prefixes.python2 }}virtualenv
# -------------------------------------------------------------
# Ruby
# -------------------------------------------------------------
devserver_software_dev_ruby:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages_prefixes.rubygem }}rubocop
# -------------------------------------------------------------
# Rust
# -------------------------------------------------------------
devserver_software_dev_rust:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- rust
# -------------------------------------------------------------
# Shell
# -------------------------------------------------------------
devserver_software_dev_shell:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- hs-ShellCheck
# -------------------------------------------------------------
# TCL
# -------------------------------------------------------------
devserver_software_dev_tcl:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- rlwrap
- tcllib
- tclsoap
- {{ packages.tcltls }}
- {{ packages.tdom }}
# -------------------------------------------------------------
# Web development
# -------------------------------------------------------------
devserver_software_dev_web:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- memcached
- phantomjs
# -------------------------------------------------------------
# Tools like code review utilities
#
# Arcanist is installed in the Phabricator states
# -------------------------------------------------------------
devserver_software_dev_misctools:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- git-review
diff --git a/roles/devserver/userland-software/misc.sls b/roles/devserver/userland-software/misc.sls
index 2541a96..57ca978 100644
--- a/roles/devserver/userland-software/misc.sls
+++ b/roles/devserver/userland-software/misc.sls
@@ -1,147 +1,137 @@
# -------------------------------------------------------------
# Salt — Provision dev software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-20
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs, packages, packages_prefixes with context %}
devserver_software_misc_vcs:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
# VCS
- cvs
- fossil
- subversion
# Bridges
- cvs2svn
- {{ packages_prefixes.python2 }}hg-git
devserver_software_misc_media:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- ffmpeg2theora
- opencore-amr
- opus
- speex
- speexdsp
- x265
devserver_software_misc_text_processing:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- antiword
- odt2txt
- texlive-full
devserver_software_misc_security:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- aescrypt
- pwgen
- vault
devserver_software_misc_tools:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- boxes
- cursive
- fusefs-s3fs
- gist
- p7zip
- primegen
- rsync
- unix2dos
{% if grains['os'] == 'FreeBSD' %}
- gawk
{% endif %}
{% if grains['os'] == 'FreeBSD' %}
devserver_software_misc_ports:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- ccache
- portmaster
- portshaker
- porttools
- poudriere
- portsearch
portsearch_database:
cmd.run:
- name: portsearch -u
- creates: /var/db/portsearch
- require:
- pkg: devserver_software_misc_ports
/var/cache/ccache:
file.directory
/etc/make.conf:
file.managed:
- source: salt://roles/devserver/userland-software/files/make.conf
freebsd_kernel_modules:
pkg.installed:
- pkgs:
- pefs-kmod
freebsd_kernel_modules_enable:
module.wait:
- name: kmod.load
- mod: pefs
- persist: True
- watch:
- pkg: freebsd_kernel_modules
{% endif %}
devserver_software_misc_p2p:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- transmission-daemon
- transmission-web
devserver_software_misc_gadgets:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- asciiquarium
- binclock
- ditaa
- epte
- weatherspect
devserver_software_misc_games:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- bsdgames
- textmaze
devserver_software_misc_network:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- getdns
- iftop
{% if grains['os_family'] == 'Debian' %}
- sockstat
{% endif %}
# -------------------------------------------------------------
# Custom simple binaries
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ dirs.bin }}/shell:
file.managed:
- source: salt://roles/devserver/userland-software/files/shell.py
- mode: 755
diff --git a/roles/mailserver/dkim/init.sls b/roles/mailserver/dkim/init.sls
index 09d4ff7..3038acc 100644
--- a/roles/mailserver/dkim/init.sls
+++ b/roles/mailserver/dkim/init.sls
@@ -1,49 +1,48 @@
# -------------------------------------------------------------
# Salt — OpenDKIM configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-01-14
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
# OpenDKIM configuration files
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
opendkim_config_files:
file.recurse:
- name: {{ dirs.etc }}/opendkim
- source: salt://roles/mailserver/dkim/files/etc
- include_empty: True
- clean: False
- dir_mode: 711
- file_mode: 644
opendkim_keys_directory:
file.directory:
- name: {{ dirs.etc }}/opendkim/keys
- dir_mode: 711
- user: opendkim
- group: opendkim
# -------------------------------------------------------------
# OpenDKIM binaries
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
opendkim_software:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- opendkim
{% if grains['os_family'] == 'Debian' %}
- opendkim-tools
{% endif %}
opendkim_extra_utilities:
file.recurse:
- name: /usr/local/bin
- source: salt://roles/mailserver/dkim/files/bin
- dir_mode: 755
- file_mode: 755
diff --git a/roles/paas-lxc/lxc/init.sls b/roles/paas-lxc/lxc/init.sls
index 68765b6..0f9b855 100644
--- a/roles/paas-lxc/lxc/init.sls
+++ b/roles/paas-lxc/lxc/init.sls
@@ -1,21 +1,20 @@
# -------------------------------------------------------------
# Salt — LXC
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-04-29
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Software
# -------------------------------------------------------------
lxc_packages:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- lxc
{% if grains['os_family'] == 'RedHat' %}
- lxc-extra
- lxc-templates
{% endif %}
diff --git a/roles/shellserver/database/mysql.sls b/roles/shellserver/database/mysql.sls
index cd226a5..a81c774 100644
--- a/roles/shellserver/database/mysql.sls
+++ b/roles/shellserver/database/mysql.sls
@@ -1,29 +1,28 @@
# -------------------------------------------------------------
# Salt — Provision MySQL
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2017-01-23
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs, packages with context %}
# -------------------------------------------------------------
# Software
# -------------------------------------------------------------
mysql:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.mariadb }}
full_text_search_stopwords_file:
file.managed:
- name: /opt/stopwords.txt
- source: salt://roles/shellserver/database/files/stopwords.txt
mysql_config:
file.managed:
- name: {{ dirs.etc }}/my.cnf
- source: salt://roles/shellserver/database/files/my.cnf
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
index 3b9d6cd..1e7b519 100644
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -1,277 +1,267 @@
# -------------------------------------------------------------
# Salt — Provision base software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-09
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs, packages, packages_prefixes with context %}
# -------------------------------------------------------------
# Editors
#
# Disclaimer: We don't caution the views of Richard Stallman
# or the Church of Emacs positions.
# See http://geekfeminism.wikia.com/wiki/EMACS_virgins_joke
# -------------------------------------------------------------
editors:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- vim
- nano
- joe
- {{ packages.emacs }}
# -------------------------------------------------------------
# General UNIX utilities
# -------------------------------------------------------------
utilities:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- mosh
- cmatrix
- figlet
- {{ packages.gpg }}
- grc
- moreutils
- nmap
- toilet
- tmux
- tree
- unrar
- whois
- woof
- zip
{% if grains['os_family'] == 'Debian' %}
- bsdmainutils
- sockstat
- dnsutils
- sysvbanner
- toilet-fonts
{% endif %}
{% if grains['os'] == 'FreeBSD' %}
- figlet-fonts
- bind-tools
- sudo
- coreutils
- gsed
- wget
{% endif %}
utilities_www:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- links
- w3m
- lynx
# -------------------------------------------------------------
# More exotic shells
# -------------------------------------------------------------
userland_software_shells:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- fish
# -------------------------------------------------------------
# Development
# -------------------------------------------------------------
dev:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- autoconf
- automake
- git
- git-lfs
- colordiff
- cmake
- valgrind
- jq
- {{ packages.cppunit }}
- {{ packages.ag }}
{% if grains['os'] == 'FreeBSD' %}
- hub
{% else %}
- arcanist
- clang
- llvm
- strace
{% endif %}
{% if grains['os_family'] == 'Debian' %}
dev_popular_libs:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- libssl-dev
{% endif %}
# -------------------------------------------------------------
# Languages
# -------------------------------------------------------------
languages_removed:
pkg:
- removed
- pkgs:
{% if grains['os_family'] == 'Debian' %}
- php7.0
- php7.1
{% elif grains['os'] == 'FreeBSD' %}
- php70
- php71
{% endif %}
languages:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- python3
- {{ packages.tcl }}
{% if grains['os_family'] == 'Debian' %}
- php7.2
{% elif grains['os'] == 'FreeBSD' %}
- php72
{% endif %}
# -------------------------------------------------------------
# De facto standard libraries for languages
# -------------------------------------------------------------
languages_libs:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
# PHP extensions
- {{ packages_prefixes.php }}bcmath
- {{ packages_prefixes.php }}ctype
- {{ packages_prefixes.php }}curl
- {{ packages_prefixes.php }}dom
- {{ packages_prefixes.php }}gd
- {{ packages_prefixes.php }}intl
- {{ packages_prefixes.php }}json
- {{ packages_prefixes.php }}mbstring
- {{ packages_prefixes.php }}mysqli
- {{ packages_prefixes.php }}pdo
- {{ packages_prefixes.php }}phar
- {{ packages_prefixes.php }}simplexml
- {{ packages_prefixes.php }}soap
- {{ packages_prefixes.php }}tokenizer
- {{ packages_prefixes.php }}wddx
- {{ packages_prefixes.php }}xml
- {{ packages_prefixes.php }}xmlwriter
- {{ packages_prefixes.php }}xsl
{% if grains['os_family'] == 'Debian' %}
# On Debian, these PDO extensions doesn't follow regular names
# but are installed if you require the legacy extension name.
- {{ packages_prefixes.php }}mysql
- {{ packages_prefixes.php }}sqlite3
{% else %}
# On Debian, these extensions are now shipped by default:
- {{ packages_prefixes.php }}fileinfo
- {{ packages_prefixes.php }}filter
- {{ packages_prefixes.php }}hash
- {{ packages_prefixes.php }}iconv
- {{ packages_prefixes.php }}openssl
- {{ packages_prefixes.php }}pcntl
- {{ packages_prefixes.php }}session
- {{ packages_prefixes.php }}xmlreader
- {{ packages_prefixes.php }}zlib
# On Debian, these PDO extensions doesn't follow regular names:
- {{ packages_prefixes.php }}pdo_mysql
- {{ packages_prefixes.php }}pdo_sqlite
{% endif %}
# PHP utilities
{% if grains['os'] != 'FreeBSD' %}
# On FreeBSD, PEAR is still a PHP 5.6 package (last tested 2018-02-17).
# Same for Composer (last tested 2018-02-28)
- {{ packages.composer }}
- {{ packages.pear }}
- {{ packages.phpcs }}
{% endif %}
# Standard Python modules
{% if grains['os'] == 'FreeBSD' %}
- {{ packages_prefixes.python3 }}gdbm
- {{ packages_prefixes.python3 }}sqlite3
{% endif %}
# TCL
- tcllib
- {{ packages.tcltls }}
# -------------------------------------------------------------
# Workaround : install composer and phpcs on FreeBSD
# -------------------------------------------------------------
{% if grains['os'] == 'FreeBSD' %}
/opt/composer:
file.directory
/opt/composer/composer.phar:
file.managed:
- source: https://raw.githubusercontent.com/composer/getcomposer.org/c1ad3667731e/web/download/1.6.3/composer.phar
- source_hash: 52cb7bbbaee720471e3b34c8ae6db53a38f0b759c06078a80080db739e4dcab6
- mode: 755
{{ dirs.bin }}/composer:
file.symlink:
- target: /opt/composer/composer.phar
- require:
- file: /opt/composer/composer.phar
/opt/phpcs:
file.directory
{% for command in ['phpcs', 'phpcbf'] %}
/opt/phpcs/{{ command }}:
file.managed:
- source: https://squizlabs.github.io/PHP_CodeSniffer/{{ command }}.phar
- skip_verify: True
- mode: 755
{{ dirs.bin }}/{{ command }}:
file.symlink:
- target: /opt/phpcs/{{ command }}
- require:
- file: /opt/phpcs/{{ command }}
{% endfor %}
{% endif %}
# -------------------------------------------------------------
# Spelling and language utilities
# -------------------------------------------------------------
spelling:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.verbiste }}
- {{ packages['aspell-fr'] }}
- {{ packages['aspell-en'] }}
# -------------------------------------------------------------
# Media utilities
# -------------------------------------------------------------
media:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- {{ packages.exiftool }}
- id3v2
- {{ packages.imagemagick }}
- optipng
- sox
diff --git a/roles/shellserver/userland-software/irc.sls b/roles/shellserver/userland-software/irc.sls
index c2ea0af..d3d7004 100644
--- a/roles/shellserver/userland-software/irc.sls
+++ b/roles/shellserver/userland-software/irc.sls
@@ -1,63 +1,60 @@
# -------------------------------------------------------------
# Salt — Provision IRC software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2016-04-09
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
# IRC clients
# -------------------------------------------------------------
irc_clients:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- irssi
- irssi-scripts
- weechat
{% if grains['os'] != 'Debian' and grains['os'] != 'Ubuntu' %}
# Reference: supremetechs.com/tag/bitchx-removed-from-debian
- bitchx
{% endif %}
# -------------------------------------------------------------
# Bouncers
# -------------------------------------------------------------
irc_bouncers:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- znc
# -------------------------------------------------------------
# Bots
# -------------------------------------------------------------
eggdrop_installer:
file.managed:
- name: /usr/local/bin/install-eggdrop
- source: salt://roles/shellserver/userland-software/files/install-eggdrop.sh
- mode: 755
# -------------------------------------------------------------
# Misc
# -------------------------------------------------------------
irc_misc:
- pkg:
- - installed
+ pkg.installed:
- pkgs:
- bitlbee
- oidentd
- pisg
oidentd_config:
file.managed:
- name: {{ dirs.etc }}/oidentd.conf
- source: salt://roles/shellserver/userland-software/files/oidentd.conf
- mode: 644
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Sun, Nov 24, 20:39 (9 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258301
Default Alt Text
(23 KB)
Attached To
Mode
rOPS Nasqueron Operations
Attached
Detach File
Event Timeline
Log In to Comment