Merge jidometa-scripts into jidoteki-admin

aw · aw · commit 5c428ebfaa02 · 2018-03-07T08:00:10.000Z
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.modules/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,15 @@
+language: bash
+sudo: required
+cache: apt
+dist: precise
+
+before_script:
+  - wget http://software-lab.de/picoLisp-16.6.tgz -O /tmp/picolisp.tgz
+  - cd /tmp; tar -xf /tmp/picolisp.tgz
+  - cd /tmp/picoLisp/src64 && make
+  - export PATH=$PATH:/tmp/picoLisp
+  - sudo pip install ansible==1.8.4
+
+script:
+  - export PATH=$PATH:/tmp/picoLisp
+  - cd ${TRAVIS_BUILD_DIR} && make check PREFIX_DIR=/tmp/meta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.20.0 (2018-02-04)
+
+  * Update process uses fixed disk temporarily, reduces memory requirement for update packages
+  * Merge 'jidometa-scripts' repo into this one
+  * Add Travis tests for tc-functions helpers
+  * Renamed 'Jidoteki' to 'On-Prem'
+
 ## 1.19.0 (2017-12-17)
 
   * Dry-run stunnel to check for valid TLS certs
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013-2017 Alexander Williams, Unscramble <license@unscramble.jp>
+Copyright (c) 2013-2018 Alexander Williams, Unscramble <license@unscramble.jp>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
@@ -0,0 +1,11 @@
+# Jidoteki Admin Makefile
+
+.PHONY: all check run-tests
+
+all:
+		ansible-playbook jidoteki.yml -c local -i images.inventory -e prefix=$(PREFIX_DIR) --tags=admin -s -v
+
+check: all run-tests
+
+run-tests:
+		JIDO_ADMIN_PATH=$(PREFIX_DIR)/opt/jidoteki/tinyadmin ./test.l
diff --git a/README.md b/README.md
@@ -1,37 +1,49 @@
-# Jidoteki virtual appliance & live image administration
+# On-Prem virtual appliance & live image administration
 
-[![GitHub release](https://img.shields.io/github/release/unscramble/jidoteki-admin.svg)](https://jidoteki.com)
+[![GitHub release](https://img.shields.io/github/release/on-prem/jidoteki-admin.svg)](https://on-premises.com) [![Build Status](https://travis-ci.org/on-prem/jidoteki-admin.svg?branch=master)](https://travis-ci.org/on-prem/jidoteki-admin)  [![Dependency](https://img.shields.io/badge/[deps]&#32;picolisp--semver-v0.10.0-ff69b4.svg)](https://github.com/aw/picolisp-semver) [![Dependency](https://img.shields.io/badge/[deps]&#32;picolisp--json-v3.2.0-ff69b4.svg)](https://github.com/aw/picolisp-json) [![Dependency](https://img.shields.io/badge/[deps]&#32;picolisp--unit-v2.1.0-ff69b4.svg)](https://github.com/aw/picolisp-unit.git)
 
-[Jidoteki](https://jidoteki.com) installs the `Jidoteki Admin` package in `/opt/jidoteki`.
+[On-Prem](https://on-premises.com) installs the `On-Prem Admin` package in `/opt/jidoteki`.
 
 This repository contains bash scripts, ansible roles, and other files needed to perform remote virtual appliance or live image administration, updates, etc.
 
-## Requirements
+# Requirements
 
 * Ansible 1.5.x
 * curl
+* git
 * sha1sum (from core-utils)
-* [symlinktool](https://github.com/aw/tinycore-symlinktool) for running backups
+* [symlinktool](https://github.com/on-prem/tinycore-symlinktool) for running backups
 * [openssl](https://openssl.org/) v1.0.2+, for validating TLS certs
 * [stunnel](https://www.stunnel.org) for validating TLS certs
 
-## Ansible roles
+# Usage
 
-There is 1 role executed:
+```
+# replace <destdir> with the directory prefix to install the files
+ansible-playbook jidoteki.yml -c local -i images.inventory -e prefix=<destdir> --tags=admin
+```
 
-  - admin
+### tags
 
-### admin role
+There exist two `tags` for running the ansible roles:
+
+  - **admin**: executes every task in the role, installing all On-Prem Admin scripts
+  - **lib**: only executes tasks related to the lib dependencies, without the On-Prem Admin scripts
 
-The `admin` configures directories and files in `/opt/jidoteki/admin` or `/opt/jidoteki/tinyadmin`.
+### admin role
 
-Here is what the `admin` role does:
+The `admin` role configures directories and files in `/opt/jidoteki/tinyadmin`:
 
   * Create admin directory structure
   * Create admin directories writeable by root/admin
   * Create admin sftp uploads directory
   * Add SSH admin management scripts
   * Add SSH admin wrapper script
+  * Add SSH admin lib dependencies
+
+# Tests
+
+To run the tests, type `make check`
 
 # Changelog
 
diff --git a/group_vars/images b/group_vars/images
@@ -5,4 +5,15 @@ admin_type: LIVE IMAGE
 admin_type_lowcase: live image
 ssh_path: /usr/local/etc/ssh
 
-jidoteki_admin_version: 1.19.0
+jidoteki_admin_version: 1.20.0
+
+jidoteki_lib_deps:
+  - repo: https://github.com/aw/picolisp-json.git
+    dir: .modules/picolisp-json/HEAD
+    ref: v3.2.0
+  - repo: https://github.com/aw/picolisp-semver.git
+    dir: .modules/picolisp-semver/HEAD
+    ref: v0.10.0
+  - repo: https://github.com/aw/picolisp-unit.git
+    dir: .modules/picolisp-unit/HEAD
+    ref: v2.1.0
diff --git a/images.inventory b/images.inventory
@@ -1,2 +1,2 @@
 [images]
-images ansible_python_interpreter=/usr/local/bin/python
+images
diff --git a/roles/admin/tasks/main.yml b/roles/admin/tasks/main.yml
@@ -2,20 +2,6 @@
 #
 # user/group 998 = sftpadmin, 997 = admin, 50 = staff, 0 = root
 
-- name: Create admin home directories
-  file: >
-    state=directory
-    path={{ prefix }}{{ item }}
-    owner=997
-    group=997
-    mode=1750
-    recurse=no
-  with_items:
-    - "{{ admin_path }}/home"
-    - "{{ admin_path }}/home/.ssh"
-  tags:
-    - admin
-
 - name: Create admin directory structure
   file: >
     state=directory
@@ -24,11 +10,28 @@
     group=0
     mode=0755
   with_items:
+    - "{{ admin_path }}"
     - "{{ admin_path }}/bin"
     - "{{ admin_path }}/tmp"
+    - "{{ admin_path }}/lib"
     - "{{ admin_path }}/home/sftp"
   tags:
     - admin
+    - lib
+
+- name: Create admin home directories
+  file: >
+    state=directory
+    path={{ prefix }}{{ item }}
+    owner=997
+    group=997
+    mode=1750
+    recurse=no
+  with_items:
+    - "{{ admin_path }}/home"
+    - "{{ admin_path }}/home/.ssh"
+  tags:
+    - admin
 
 - name: Create admin sftp uploads directory
   file: >
@@ -87,3 +90,27 @@
     mode=0750
   tags:
     - admin
+
+- name: Add SSH admin library scripts
+  template: >
+    src={{ item }}.j2
+    dest="{{ prefix }}{{ admin_path }}/lib/{{ item }}"
+    owner=0
+    group=0
+    mode=0644
+  with_items:
+    - tc-functions.l
+  tags:
+    - admin
+    - lib
+
+- name: Add SSH admin library deps
+  git: >
+    dest={{ prefix }}{{ admin_path }}/lib/{{ item.dir }}
+    repo={{ item.repo }}
+    version={{ item.ref }}
+  with_items:
+    - "{{ jidoteki_lib_deps }}"
+  tags:
+    - admin
+    - lib
diff --git a/roles/admin/templates/tc-functions.l.j2 b/roles/admin/templates/tc-functions.l.j2
diff --git a/roles/admin/templates/update_vm.sh.j2 b/roles/admin/templates/update_vm.sh.j2
diff --git a/test.l b/test.l
diff --git a/tests/test_tc-functions.l b/tests/test_tc-functions.l

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 The MIT License
 -Copyright (c) 2013-2017 Alexander Williams, Unscramble <[email protected]>
 +Copyright (c) 2013-2018 Alexander Williams, Unscramble <[email protected]>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[images]`
`2`		`-images ansible_python_interpreter=/usr/local/bin/python`
	`2`	`+images`