mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Test (#20)
* change apache_data to apache_user in all * no libapach2 in centos. just php. no php-magick in centos * remove redundant vars entries * do not create apache user * missed one pound sign * soft code all references to apache_user * centos requires older setuptools * revert ansible_lsb.id in xsce.yml * try getting recent pip * move pip download to 2prep so that kalite success is not dependent on iiab coming first * still need to replace setuptools in kalite * add curl -- needed in debian * massivly substitue iiab for xsce, and rename files * completed runansible * centos fixes,install pip * appliance means no iptables rules * change to earlier version of setuptools for centos * delete file duplicate, hopefully unnecessary. generate the offline docs * wiki docs errors * create the admin group -- deleted earlier * use the --yes option with pip uninstall * base of repo moved from schoolserver to iiab, unleashkids.org->iiab.io * network detection broken due to tupo
This commit is contained in:
georgejhunt
GitHub
parent
6ef68cc480
commit
f319afa432
179 changed files with 978 additions and 672 deletions
|
|
@ -34,11 +34,11 @@
|
|||
|
||||
Internet-in-a-Box also contains a number of applications each of which has its own attribution information which is included.<br><br>
|
||||
|
||||
This Internet-in-a-Box distribution resides at <a href="http://github.com/XSCE/xsce">github.com/XSCE/xsce</a>.<br><br>
|
||||
This Internet-in-a-Box distribution resides at <a href="http://github.com/XSCE/iiab">github.com/XSCE/iiab</a>.<br><br>
|
||||
|
||||
It is licensed under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>
|
||||
|
||||
Licensing information may be found at <a href="http://github.com/XSCE/xsce/blob/master/LICENSE">github.com/XSCE/xsce/blob/master/LICENSE</a>.<br>
|
||||
Licensing information may be found at <a href="http://github.com/XSCE/iiab/blob/master/LICENSE">github.com/XSCE/iiab/blob/master/LICENSE</a>.<br>
|
||||
|
||||
</BODY>
|
||||
<script type="text/javascript" src="incl/xs-portal.js"></script>
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@
|
|||
|
||||
Internet-in-a-Box also contains a number of applications each of which has its own attribution information which is included.<br><br>
|
||||
|
||||
This Internet-in-a-Box distribution resides at <a href="http://github.com/XSCE/xsce">github.com/XSCE/xsce</a>.<br><br>
|
||||
This Internet-in-a-Box distribution resides at <a href="http://github.com/XSCE/iiab">github.com/XSCE/iiab</a>.<br><br>
|
||||
|
||||
It is licensed under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.<br><br>
|
||||
|
||||
Licensing information may be found at <a href="http://github.com/XSCE/xsce/blob/master/LICENSE">github.com/XSCE/xsce/blob/master/LICENSE</a>.<br>
|
||||
Licensing information may be found at <a href="http://github.com/XSCE/iiab/blob/master/LICENSE">github.com/XSCE/iiab/blob/master/LICENSE</a>.<br>
|
||||
|
||||
</BODY>
|
||||
<script type="text/javascript" src="incl/xs-portal.js"></script>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
- name: Create home directory
|
||||
file: path={{ doc_root }}/home
|
||||
mode=0755
|
||||
owner={{ apache_data }}
|
||||
group={{ apache_data }}
|
||||
owner={{ apache_user }}
|
||||
group={{ apache_user }}
|
||||
state=directory
|
||||
|
||||
- name: Install admin home page into apache2
|
||||
template: src=xsce-home-page.conf
|
||||
dest=/etc/{{ apache_config_dir }}/xsce-home-page.conf
|
||||
template: src=iiab-home-page.conf
|
||||
dest=/etc/{{ apache_config_dir }}/iiab-home-page.conf
|
||||
|
||||
- name: Enable the home page
|
||||
file: src=/etc/{{ apache_config_dir }}/xsce-home-page.conf
|
||||
dest=/etc/apache2/sites-enabled/xsce-home-page.conf
|
||||
file: src=/etc/{{ apache_config_dir }}/iiab-home-page.conf
|
||||
dest=/etc/apache2/sites-enabled/iiab-home-page.conf
|
||||
state=link
|
||||
when: is_debuntu
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@
|
|||
with_fileglob:
|
||||
- html/assets/*
|
||||
|
||||
- name: Create symlink from assets to xsce.ini
|
||||
file: src=/etc/xsce/xsce.ini
|
||||
dest={{ doc_root }}/common/assets/xsce.ini
|
||||
- name: Create symlink from assets to iiab.ini
|
||||
file: src=/etc/iiab/iiab.ini
|
||||
dest={{ doc_root }}/common/assets/iiab.ini
|
||||
owner=root
|
||||
group=root
|
||||
state=link
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
group=root
|
||||
mode={{ item.mode }}
|
||||
with_items:
|
||||
- { src: '010-xsce.conf.j2' , dest: '/etc/{{ apache_config_dir }}/010-xsce.conf', mode: '0755' }
|
||||
- { src: '010-iiab.conf.j2' , dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' }
|
||||
- { src: 'proxy_ajp.conf.j2' , dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' }
|
||||
- { src: 'php.ini.j2' , dest: '/etc/php.ini' , mode: '0644' }
|
||||
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
src=/etc/apache2/sites-available/{{ item }}
|
||||
state=link
|
||||
with_items:
|
||||
- 010-xsce.conf
|
||||
- 010-iiab.conf
|
||||
when: is_debuntu
|
||||
|
||||
- name: Remove the default site container
|
||||
|
|
@ -110,8 +110,8 @@
|
|||
- name: Create httpd log dir
|
||||
file: path=/var/log/{{ apache_service }}
|
||||
mode=0755
|
||||
owner={{ apache_data }}
|
||||
group={{ apache_data }}
|
||||
owner={{ apache_user }}
|
||||
group={{ apache_user }}
|
||||
state=directory
|
||||
|
||||
- name: Enable httpd
|
||||
|
|
@ -121,8 +121,8 @@
|
|||
- name: Create iiab-info directory
|
||||
file: path={{ doc_root }}/info
|
||||
mode=0755
|
||||
owner={{ apache_data }}
|
||||
group={{ apache_data }}
|
||||
owner={{ apache_user }}
|
||||
group={{ apache_user }}
|
||||
state=directory
|
||||
|
||||
- name: Remove iiab-info.conf
|
||||
|
|
@ -139,3 +139,13 @@
|
|||
- base
|
||||
|
||||
- include: home-page.yml
|
||||
|
||||
- name: place the script to generate home pages
|
||||
template: src=refresh-wiki-docs.sh
|
||||
dest=/usr/bin/xs-refresh-wiki-docs
|
||||
mode=0755
|
||||
|
||||
- name: generate the offline documents
|
||||
command: /usr/bin/xs-refresh-wiki-docs
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ MaxRequestsPerChild 0
|
|||
# <VirtualHost> definition. These values also provide defaults for
|
||||
# any <VirtualHost> containers you may define later in the file.
|
||||
|
||||
ServerName {{ xsce_hostname }}
|
||||
ServerName {{ iiab_hostname }}
|
||||
|
||||
#
|
||||
# UseCanonicalName: Determines how Apache constructs self-referencing
|
||||
|
|
@ -6,4 +6,4 @@
|
|||
# RedirectMatch of root to home page
|
||||
# See the note in default_vars.yml
|
||||
|
||||
RedirectMatch ^/$ {{ xsce_home_url }}
|
||||
RedirectMatch ^/$ {{ iiab_home_url }}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Alias /info/ {{ xsce_dir }}/docs/html/
|
||||
Alias /info {{ xsce_dir }}/docs/html/
|
||||
Alias /info/ {{ iiab_dir }}/docs/html/
|
||||
Alias /info {{ iiab_dir }}/docs/html/
|
||||
|
||||
<directory {{ xsce_dir }}/docs/html>
|
||||
<directory {{ iiab_dir }}/docs/html>
|
||||
Options +Indexes
|
||||
IndexOptions FancyIndexing
|
||||
IndexOptions HTMLTable
|
||||
|
|
|
|||
65
roles/httpd/templates/refresh-wiki-docs.sh
Executable file
65
roles/httpd/templates/refresh-wiki-docs.sh
Executable file
|
|
@ -0,0 +1,65 @@
|
|||
#!/bin/bash -x
|
||||
# pull down repo wiki, and imbed in docs subdirectory
|
||||
|
||||
source /etc/iiab/iiab.env
|
||||
REPONAME=iiab
|
||||
REPO=https://github.com/iiab
|
||||
WIKI=iiab-wiki
|
||||
TARGET_URL=/info
|
||||
WWWROOT=/library/www/html
|
||||
INPUT=/tmp/${WIKI}
|
||||
OUTPUT=/tmp/${WIKI}.out
|
||||
|
||||
# this script is located in the scritps/ directory in the local repo
|
||||
SCRIPTDIR=$(dirname $0)
|
||||
pushd $SCRIPTDIR
|
||||
|
||||
rm -rf $INPUT
|
||||
rm -rf $OUTPUT
|
||||
mkdir -p $INPUT
|
||||
mkdir -p $OUTPUT
|
||||
|
||||
git clone $REPO/$REPONAME.wiki.git $INPUT
|
||||
|
||||
mkdir -p $WWWROOT$TARGET_URL/html
|
||||
|
||||
# To Do find more links to rewrite, especially after moving from iiab to iiab
|
||||
for f in `ls /tmp/${WIKI}`; do
|
||||
FTRIMMED=${f%.md}
|
||||
if [ $FTRIMMED = "Home" ]; then FTRIMMED=index;fi
|
||||
pandoc -s /tmp/${WIKI}/$f -o $OUTPUT/$FTRIMMED.html
|
||||
# make links refer to local directory
|
||||
sed -i -e "s|$REPO/$REPONAME/wiki/\(.*\)\">|./\1.html\">|" $OUTPUT/$FTRIMMED.html
|
||||
sed -i -e "s|http://schoolserver.org/faq|/info/html/FAQ|" $OUTPUT/$FTRIMMED.html
|
||||
sed -i -e "s|$REPO/$REPONAME/blob/release-.*/\(.*\)\">|./\1.html\">|" $OUTPUT/$FTRIMMED.html
|
||||
done
|
||||
|
||||
rsync -av $OUTPUT/ $WWWROOT$TARGET_URL
|
||||
|
||||
# copy the faq and other things
|
||||
lynx -reload -source http://wiki.laptop.org/go/XS_Community_Edition/FAQ > $WWWROOT$TARGET_URL/html/FAQ
|
||||
lynx -reload -source http://wiki.laptop.org/go/XS_Community_Edition/Security > $WWWROOT$TARGET_URL/html/Security
|
||||
lynx -reload -source http://wiki.laptop.org/go/XS_Community_Edition/local_vars.yml > $WWWROOT$TARGET_URL/html/local_vars.yml
|
||||
|
||||
# fetch the embedded help pages from the admin console
|
||||
#for f in `ls ../roles/iiab-admin/files/console/help`; do
|
||||
# FTRIMMED=${f%.rst}
|
||||
# pandoc -s ../roles/iiab-admin/files/console/help/$f -o ../docs/html/offline-help/$FTRIMMED.html
|
||||
# # make links refer to local directory
|
||||
# sed -i -e "s|$REPO/$REPONAME/wiki/\(.*\)\">|./\1.html\">)|" ../docs/html/$FTRIMMED.html
|
||||
#done
|
||||
|
||||
# fetch the recent release notes
|
||||
for f in `ls ../Release*`; do
|
||||
# FTRIMMED=${f%.md}
|
||||
FTRIMMED=${f:2}
|
||||
pandoc -s $f -o $WWWROOT$TARGET_URL$FTRIMMED.html
|
||||
# make links refer to local directory
|
||||
sed -i -e "s|$REPO/$REPONAME/wiki/\(.*\)\">|./\1.html\">)|" $WWWROOT$TARGET_URL$FTRIMMED.html
|
||||
done
|
||||
|
||||
rm -rf $INPUT
|
||||
rm -rf $OUTPUT
|
||||
|
||||
popd
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue