Page MenuHomeDevCentral
Files F3769135

D2363.diff
No OneTemporary
Actions

D2363.diff
View Options

diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls
--- a/roles/devserver/userland-software/dev.sls
+++ b/roles/devserver/userland-software/dev.sls
@@ -73,6 +73,7 @@
pkg.installed:
- pkgs:
- {{ packages.phpunit }}
+ - {{ packages_prefixes.pecl }}ast
# -------------------------------------------------------------
# Python
diff --git a/roles/devserver/userland-software/files/ast.ini b/roles/devserver/userland-software/files/ast.ini
deleted file mode 100644
--- 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
-; -------------------------------------------------------------
-;
-; <auto-generated>
-; 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.
-; </auto-generated>
-
-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
--- 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
--- a/roles/devserver/userland-software/init.sls
+++ b/roles/devserver/userland-software/init.sls
@@ -20,6 +20,5 @@
- .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
--- 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

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 13:10 (9 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2260218
Default Alt Text
D2363.diff (4 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator