diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls index f224cd5..bcf4632 100644 --- a/roles/devserver/userland-software/dev.sls +++ b/roles/devserver/userland-software/dev.sls @@ -1,150 +1,151 @@ # ------------------------------------------------------------- # 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: - pkgs: - {{ packages.boost }} - cmocka - {{ packages.librabbitmq }} # ------------------------------------------------------------- # Java # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_java: pkg.installed: - pkgs: - openjdk8 - apache-ant - maven # ------------------------------------------------------------- # .Net languages # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_dotnet: pkg.installed: - pkgs: - mono # ------------------------------------------------------------- # Node # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_node: pkg.installed: - pkgs: - {{ packages.node }} - npm devserver_node_packages: npm.installed: - pkgs: - bower - browserify - csslint - eslint - gulp - grunt - jscs - jshint - jsonlint - react-tools - require: - pkg: devserver_software_dev_node # ------------------------------------------------------------- # PHP # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_php: pkg.installed: - pkgs: - {{ packages.phpunit }} + - {{ packages_prefixes.pecl }}ast # ------------------------------------------------------------- # Python # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_python: 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: - pkgs: - {{ packages_prefixes.rubygem }}rubocop # ------------------------------------------------------------- # Rust # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_rust: pkg.installed: - pkgs: - rust # ------------------------------------------------------------- # Shell # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_shell: pkg.installed: - pkgs: - hs-ShellCheck # ------------------------------------------------------------- # TCL # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_tcl: pkg.installed: - pkgs: - rlwrap - tcllib - tclsoap - {{ packages.tcltls }} - {{ packages.tdom }} # ------------------------------------------------------------- # Web development # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_web: pkg.installed: - pkgs: - memcached # ------------------------------------------------------------- # Tools like code review utilities # # Arcanist is installed in the Phabricator states # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - devserver_software_dev_misctools: pkg.installed: - pkgs: - git-review diff --git a/roles/devserver/userland-software/files/ast.ini b/roles/devserver/userland-software/files/ast.ini deleted file mode 100644 index 18d10b7..0000000 --- a/roles/devserver/userland-software/files/ast.ini +++ /dev/null @@ -1,16 +0,0 @@ -; ------------------------------------------------------------- -; PHP configuration -; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; Project: Nasqueron -; License: Trivial work, not eligible to copyright -; Source file: roles/devserver/userland-software/files/ast.ini -; ------------------------------------------------------------- -; -; -; This file is managed by our rOPS SaltStack repository. -; -; Changes to this file may cause incorrect behavior -; and will be lost if the state is redeployed. -; - -extension=ast.so diff --git a/roles/devserver/userland-software/files/install-php-extension.sh b/roles/devserver/userland-software/files/install-php-extension.sh deleted file mode 100755 index 7b6dceb..0000000 --- a/roles/devserver/userland-software/files/install-php-extension.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# ------------------------------------------------------------- -# Install PHP extension -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Project: Nasqueron -# Author: Sébastien Santoro aka Dereckson -# Created: 2018-03-29 -# License: BSD-2-Clause -# Source file: roles/devserver/userland-software/files/install-php-extension.sh -# ------------------------------------------------------------- - -AS_BUILDER="sudo -u builder" - -$AS_BUILDER phpize -$AS_BUILDER ./configure -$AS_BUILDER make diff --git a/roles/devserver/userland-software/init.sls b/roles/devserver/userland-software/init.sls index 91e1309..4c6cc82 100644 --- a/roles/devserver/userland-software/init.sls +++ b/roles/devserver/userland-software/init.sls @@ -1,25 +1,24 @@ # ------------------------------------------------------------- # Salt — Provision software # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2017-10-20 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- include: # FreeBSD ports - .ports # Shell server content - roles/shellserver/userland-software/base - roles/shellserver/userland-software/irc - roles/shellserver/userland-software/web # Builder role content - roles/builder # Software specific for development servers - .dev - .misc - .notifications - .phabricator - - .php-ast - .psysh - .wordpress diff --git a/roles/devserver/userland-software/php-ast.sls b/roles/devserver/userland-software/php-ast.sls deleted file mode 100644 index 4e2717b..0000000 --- a/roles/devserver/userland-software/php-ast.sls +++ /dev/null @@ -1,47 +0,0 @@ -# ------------------------------------------------------------- -# Salt — Provision dev software -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Project: Nasqueron -# Created: 2018-03-29 -# License: Trivial work, not eligible to copyright -# ------------------------------------------------------------- - -{% from "roles/devserver/userland-software/map.jinja" import php with context %} - -# ------------------------------------------------------------- -# Fetch software -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/opt/php-ast: - file.directory: - - user: builder - -php_ast_repository: - git.latest: - - name: https://github.com/nikic/php-ast.git - - target: /opt/php-ast - - user: builder - -# ------------------------------------------------------------- -# Build software -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -php_ast_build: - cmd.script: - - source: salt://roles/devserver/userland-software/files/install-php-extension.sh - - cwd: /opt/php-ast - - creates: /opt/php-ast/modules/ast.so - -php_ast_install: - cmd.run: - - name: make install - - cwd: /opt/php-ast - - creates: {{ php.extension_dir }}/ast.so - -# ------------------------------------------------------------- -# PHP configuration -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{ php.cli_conf_dir }}/ext-40-ast.ini: - file.managed: - - source: salt://roles/devserver/userland-software/files/ast.ini