nvim

README.md

@@ -11,9 +11,9 @@ FEATURES
   * [x] files or commands from container within
   * [x] inner command completion from container within
   * [x] colored completions (link, directories...) by reusing inputrc bindings
-* [x] advanced completion for miaou-{start,stop,destroy} according to container state
+* [x] advanced completion for miaou-{start,stop,destroy}
 
-TODO: 
+TODO
 -----
 
 * [ ] install DOCUMENTATION in README
@@ -21,7 +21,6 @@ TODO:
   * [ ] bash-completion
   * [ ] timer refresh template
 * [ ] Template erb+bash
-  * [ ] Tempalte erb+ruby-on-shell
+  * [ ] Template erb+ruby-on-shell
 * [ ] TOOLBOX
   * [ ] RUBY From Host
-

recipes/wordpress.recipe

@@ -2,6 +2,7 @@
 
 # CONSTANTS
 
+MANDATORY_PACKAGES=(nginx php-cli php-fpm php-mysql php-curl php-xml php-imagick php-zip php-gd php-intl composer mariadb-client)
 UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE-256M} #TODO: allow passing environment variables from `miaou-recipe`
 FORCE=false
 WP_NAME=
@@ -49,13 +50,11 @@ function install_mariadb {
 }
 
 function install_php {
-	local php_version=php --version | head -n1 | cut -d' ' -f2 | grep -o '^[[:digit:]]*\.[[:digit:]]*'
+  local php_version=$(php --version | head -n1 | cut -d' ' -f2 | grep -o '^[[:digit:]]*\.[[:digit:]]*')
   local php_service="php$php_version-fpm"
 
   if $FORCE || ! systemctl is-active "$php_service" --quiet; then
     apt-get install -y php-fpm php-mysql php-curl php-dom php-imagick php-mbstring php-zip php-gd php-intl
-		php_version=php --version | head -n1 | cut -d' ' -f2 | grep -o '^[[:digit:]]*\.[[:digit:]]*'
-
     sed -i "s/^post_max_size = 8M/post_max_size = $UPLOAD_MAX_SIZE/g" /etc/php/$php_version/fpm/php.ini
     sed -i "s/^upload_max_filesize = 2M/upload_max_filesize = $UPLOAD_MAX_SIZE/g" /etc/php/$php_version/fpm/php.ini
     systemctl enable "$php_service" --now
@@ -66,8 +65,10 @@ function install_php {
 }
 
 function install_nginx_host {
-	if $FORCE || [[ ! -f /etc/nginx/sites-available/sympa.conf ]]; then
-		cat << EOF > /etc/nginx/sites-available/sympa.conf
+  local wp_conf="wp-${WP_NAME}.conf"
+  local conf_file="/etc/nginx/sites-available/${wp_conf}"
+  if $FORCE || [[ ! -f ${conf_file} ]]; then
+    cat <<EOF >$conf_file
 
 server {
     listen {{ env.APP_PORT }} default_server;
@@ -116,13 +117,15 @@ EOF
   fi
 }
 
+function install_wordpress {
+  apt-get install -qqy "${MANDATORY_PACKAGES[@]}"
+  echo mandatory OK
+}
 # MAIN
 
 set -Eue -o pipefail
 parse_options "$@"
-exit 0
-
 install_mariadb
 install_php
-# install_wordpress
-# install_nginx_host
+install_wordpress
+install_nginx_host