Skip to content

Cleanup of PR #2008 "installed": introduce /etc/iiab/iiab_state.yml and begin breaking apart playbooks into install.yml + setup.yml + enable.yml #2020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
holta wants to merge 46 commits into from
Closed

Cleanup of PR #2008 "installed": introduce /etc/iiab/iiab_state.yml and begin breaking apart playbooks into install.yml + setup.yml + enable.yml #2020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
56a79e7
reuse config_vars.yml for installed app tracking
jvonau Sep 5, 2019
ab39fe9
rename 'test_kalite_installed' add installed tracker
jvonau Sep 5, 2019
8fab1e5
kiwix rework and add iiab_installed
jvonau Sep 5, 2019
ebfc137
kolibri rework and add iiab_installed
jvonau Sep 5, 2019
d1e01e8
sugarizer rework and add iiab_installed
jvonau Sep 5, 2019
7c6274e
moodle rework and add iiab_installed
jvonau Sep 5, 2019
bae9084
elgg rework and add iiab_installed
jvonau Sep 1, 2019
5e62904
wordpress db setup and installed tracker
jvonau Sep 1, 2019
9dab734
nextcloud add iiab_installed and tweeks
jvonau Sep 1, 2019
529b170
awstats split and iiab_installed
jvonau Sep 5, 2019
9151498
use lineinfile
jvonau Sep 9, 2019
1e14cab
azuracast - iiab_installed
jvonau Sep 14, 2019
9756860
bluetooth - iiab_installed
jvonau Sep 14, 2019
4463e4e
calibre-web - iiab_installed
jvonau Sep 14, 2019
24f1b4f
calibre - iiab_installed
jvonau Sep 14, 2019
e7ea453
dokuwiki - iiab_installed
jvonau Sep 14, 2019
3de43a3
gitea - iiab_installed
jvonau Sep 14, 2019
4094edc
lokole - iiab_installed
jvonau Sep 14, 2019
cb5e640
mediawiki - iiab_installed
jvonau Sep 14, 2019
8302811
minetest - iiab_installed
jvonau Sep 14, 2019
a311a0f
mosquitto - iiab_installed
jvonau Sep 14, 2019
130e6a2
munin - iiab_installed
jvonau Sep 14, 2019
9565410
nodered - iiab_installed
jvonau Sep 15, 2019
2807fbc
needs True
jvonau Oct 7, 2019
5b183e1
mongodb - iiab_installed
jvonau Oct 14, 2019
c63f9ba
provide ICO fuctionality at cmdline
jvonau Oct 10, 2019
8c74448
iiab-configure - deal with web services only
jvonau Oct 16, 2019
02fe653
use config_vars2 in source yaml files
jvonau Oct 1, 2019
4e52e41
mongo installed on image but not recorded workaround
jvonau Oct 14, 2019
d8df590
iiab-install can use faster code if /etc/iiab/config_vars2.yml exists
jvonau Oct 15, 2019
46f48fa
remove when install
jvonau Oct 15, 2019
83546e5
runrole --reinstall to remove role installed marker
jvonau Oct 16, 2019
2265a24
create config_vars2.yml at start of stage-4
jvonau Oct 16, 2019
ce2ec3b
kiwix allow reinstall/updates with runrole --reinstall
jvonau Oct 16, 2019
ddf8e1d
stage 4 installed
jvonau Oct 16, 2019
c396f44
cmdline tweeks
jvonau Oct 16, 2019
b67a19c
network guard against faulty user edits to local_vars
jvonau Oct 16, 2019
8423d73
runrole - ensure local_vars has *_install is set to True
jvonau Oct 17, 2019
a66b650
iiab_state
jvonau Oct 24, 2019
800ae2f
iiab_state2
jvonau Oct 24, 2019
9a0e054
Merge pull request #305 from iiab/master
holta Oct 24, 2019
626473e
Merge pull request #306 from jvonau/installed
holta Oct 24, 2019
b533cb6
#2008 var names, output, comments, small bugs
holta Oct 25, 2019
5ae521d
double-double-quote vars in echo for safety etc
holta Oct 25, 2019
217fdc5
Fix var name captive_portal_installed (not captiveportal_installed)
holta Oct 25, 2019
1604d8e
Remove 2 unnec '| bool' clauses
holta Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
iiab_state
  • Loading branch information
@jvonau
jvonau committed Oct 24, 2019
commit a66b65063ff12de0e5949465b4916cdb9dfb317c
2 changes: 1 addition & 1 deletion iiab-configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
INVENTORY="ansible_hosts"
PLAYBOOK="iiab-from-cmdline.yml"
CWD=`pwd`
APPS=/etc/iiab/config_vars2.yml
APPS=/etc/iiab/iiab_state.yml
ENV=/etc/iiab/iiab.env
if [ ! -f $PLAYBOOK ]; then
echo -e "\nExiting: IIAB Playbook not found."
Expand Down
2 changes: 1 addition & 1 deletion iiab-from-cmdline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- vars/default_vars.yml
- vars/{{ ansible_local.local_facts.os_ver }}.yml
- /etc/iiab/local_vars.yml
- /etc/iiab/config_vars2.yml
- /etc/iiab/iiab_state.yml

roles:
- { role: 0-init, tags: ['0-init'] }
Expand Down
2 changes: 1 addition & 1 deletion iiab-from-console.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- vars/default_vars.yml
- vars/{{ ansible_local.local_facts.os_ver }}.yml
- /etc/iiab/local_vars.yml
- /etc/iiab/config_vars2.yml
- /etc/iiab/iiab_state.yml

roles:
- { role: 0-init, tags: ['0-init'] }
Expand Down
5 changes: 5 additions & 0 deletions iiab-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then
echo -e "\n'--debug' *ignored* as STAGE (counter) < 2."
fi

# to catch up images to current code to benefit from pre-installed apps
if [ -f /etc/iiab/config_vars2.yml ]; then
mv /etc/iiab/config_vars2.yml $APPS
fi

if [ -f $APPS ]; then
if grep -q sugar $APPS; then
if ! grep -q mongodb $APPS; then
Expand Down
2 changes: 1 addition & 1 deletion iiab-network.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- vars/default_vars.yml
- vars/{{ ansible_local.local_facts.os_ver }}.yml
- /etc/iiab/local_vars.yml
- /etc/iiab/config_vars.yml
- /etc/iiab/iiab_state.yml

roles:
- { role: 0-init, tags: ['network'] }
Expand Down
2 changes: 1 addition & 1 deletion run-one-role.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- vars/default_vars.yml
- "vars/{{ ansible_local.local_facts.os_ver }}.yml"
- /etc/iiab/local_vars.yml
- /etc/iiab/config_vars2.yml
- /etc/iiab/iiab_state.yml

roles:
- { role: 0-init, tags: ['0-init'] }
Expand Down
2 changes: 1 addition & 1 deletion runrole
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PLAYBOOK="run-one-role.yml"
ARGS=""
REINSTALL=0
CWD=`pwd`
APPS=/etc/iiab/config_vars2.yml
APPS=/etc/iiab/iiab_state.yml
VARS=/etc/iiab/local_vars.yml

if [ ! -f $PLAYBOOK ]; then
Expand Down
2 changes: 1 addition & 1 deletion vars/default_vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ iiab_local_vars_file: /etc/iiab/local_vars.yml
# Installation status files
iiab_env_file: /etc/iiab/iiab.env
iiab_ini_file: /etc/iiab/iiab.ini
iiab_installed: /etc/iiab/config_vars2.yml
iiab_installed: /etc/iiab/iiab_state.yml

iiab_base: /opt/iiab
iiab_dir: "{{ iiab_base }}/iiab"
Expand Down