Added support for Moodle WebApp

This commit is contained in:
Marc Aymerich 2016-02-10 12:07:55 +00:00
parent acfa74d9ae
commit 99ced73816
8 changed files with 151 additions and 5 deletions

View File

@ -60,6 +60,7 @@ class MoodleMuBackend(ServiceController):
chown %(user)s:%(user)s %(moodledata_path)s chown %(user)s:%(user)s %(moodledata_path)s
export SITE=%(site_name)s export SITE=%(site_name)s
CHANGE_PASSWORD=0 CHANGE_PASSWORD=0
# TODO su moodle user
php %(moodle_path)s/admin/cli/install_database.php \\ php %(moodle_path)s/admin/cli/install_database.php \\
--fullname="%(site_name)s" \\ --fullname="%(site_name)s" \\
--shortname="%(site_name)s" \\ --shortname="%(site_name)s" \\

View File

@ -96,7 +96,8 @@ def create_link(modeladmin, request, queryset):
base_home = cleaned_data['base_home'] base_home = cleaned_data['base_home']
extension = cleaned_data['home_extension'] extension = cleaned_data['home_extension']
target = os.path.join(base_home, extension) target = os.path.join(base_home, extension)
link_name = cleaned_data['link_name'] or os.path.join(user.home, os.path.basename(target)) default_name = os.path.join(user.home, os.path.basename(target))
link_name = cleaned_data['link_name'] or default_name
user.create_link_target = target user.create_link_target = target
user.create_link_name = link_name user.create_link_name = link_name
operations.extend(Operation.create_for_action(user, 'create_link')) operations.extend(Operation.create_for_action(user, 'create_link'))

View File

@ -93,7 +93,8 @@ class LinkForm(forms.Form):
base_home = forms.ChoiceField(label=_("Target path"), choices=(), base_home = forms.ChoiceField(label=_("Target path"), choices=(),
help_text=_("Target link will be under this directory.")) help_text=_("Target link will be under this directory."))
home_extension = forms.CharField(label=_("Home extension"), required=False, initial='', home_extension = forms.CharField(label=_("Home extension"), required=False, initial='',
widget=forms.TextInput(attrs={'size':'70'}), help_text=_("Relative to chosen home.")) widget=forms.TextInput(attrs={'size':'70'}),
help_text=_("Relative path to chosen directory."))
link_name = forms.CharField(label=_("Link name"), required=False, initial='', link_name = forms.CharField(label=_("Link name"), required=False, initial='',
widget=forms.TextInput(attrs={'size':'70'}), widget=forms.TextInput(attrs={'size':'70'}),
help_text=_("If left blank or relative path: link will be created in each user home.")) help_text=_("If left blank or relative path: link will be created in each user home."))
@ -119,10 +120,12 @@ class LinkForm(forms.Form):
if link_name: if link_name:
if link_name.startswith('/'): if link_name.startswith('/'):
if len(self.queryset) > 1: if len(self.queryset) > 1:
raise ValidationError(_("Link name can not be a full path when multiple users.")) raise ValidationError(
_("Link name can not be a full path when multiple users."))
link_names = [os.path.dirname(link_name)] link_names = [os.path.dirname(link_name)]
else: else:
link_names = [os.path.join(user.home, os.path.dirname(link_names)) for user in self.queryset] dir_name = os.path.dirname(link_name)
link_names = [os.path.join(user.home, dir_name) for user in self.queryset]
validate_paths_exist(self.instance, link_names) validate_paths_exist(self.instance, link_names)
return link_name return link_name

View File

@ -30,7 +30,7 @@
<div> <div>
<div style="margin:20px;"> <div style="margin:20px;">
{% block introduction %} {% block introduction %}
Create link for {% for user in queryset %}{{ user.username }}{% if not forloop.last %}, {% endif %}{% endfor %}. Create simbolic link for {% for user in queryset %}{{ user.username }}{% if not forloop.last %}, {% endif %}{% endfor %}.
{% endblock %} {% endblock %}
<ul>{{ display_objects | unordered_list }}</ul> <ul>{{ display_objects | unordered_list }}</ul>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}

View File

@ -0,0 +1,97 @@
import os
import textwrap
from django.utils.translation import ugettext_lazy as _
from orchestra.contrib.orchestration import ServiceController, replace
from .. import settings
from . import WebAppServiceMixin
class MoodleBackend(WebAppServiceMixin, ServiceController):
"""
Installs the latest version of Moodle available on download.moodle.org
"""
verbose_name = _("Moodle")
model = 'webapps.WebApp'
default_route_match = "webapp.type == 'moodle-php'"
doc_settings = (settings,
('WEBAPPS_DEFAULT_MYSQL_DATABASE_HOST',)
)
def save(self, webapp):
context = self.get_context(webapp)
self.append(textwrap.dedent("""\
if [[ $(ls "%(app_path)s" | wc -l) -gt 1 ]]; then
echo "App directory not empty." 2> /dev/null
exit 0
fi
mkdir -p %(app_path)s
# Prevent other backends from writting here
touch %(app_path)s/.lock
# Weekly caching
moodle_date=$(date -r $(readlink %(cms_cache_dir)s/moodle) +%%s || echo 0)
if [[ $moodle_date -lt $(($(date +%%s)+7*24*60*60)) ]]; then
moodle_url=$(wget https://download.moodle.org/releases/latest/ -O - -q \\
| tr ' ' '\\n' \\
| grep 'moodle-latest.*.tgz"' \\
| sed -E 's#href="([^"]+)".*#\\1#' \\
| head -n 1 \\
| sed "s#download.php/#download.php/direct/#")
filename=${moodle_url##*/}
wget $moodle_url -O - --no-check-certificate \\
| tee %(cms_cache_dir)s/$filename \\
| tar -xzvf - -C %(app_path)s --strip-components=1
rm -f %(cms_cache_dir)s/moodle
ln -s %(cms_cache_dir)s/$filename %(cms_cache_dir)s/moodle
else
tar -xzvf %(cms_cache_dir)s/moodle -C %(app_path)s --strip-components=1
fi
mkdir %(app_path)s/moodledata && {
chmod 750 %(app_path)s/moodledata
echo -n 'order deny,allow\\ndeny from all' > %(app_path)s/moodledata/.htaccess
}
if [[ ! -e %(app_path)s/config.php ]]; then
cp %(app_path)s/config-dist.php %(app_path)s/config.php
sed -i "s#dbtype\s*= '.*#dbtype = '%(db_type)s';#" %(app_path)s/config.php
sed -i "s#dbhost\s*= '.*#dbhost = '%(db_host)s';#" %(app_path)s/config.php
sed -i "s#dbname\s*= '.*#dbname = '%(db_name)s';#" %(app_path)s/config.php
sed -i "s#dbuser\s*= '.*#dbuser = '%(db_user)s';#" %(app_path)s/config.php
sed -i "s#dbpass\s*= '.*#dbpass = '%(password)s';#" %(app_path)s/config.php
sed -i "s#dataroot\s*= '.*#dataroot = '%(app_path)s/moodledata';#" %(app_path)s/config.php
sed -i "s#wwwroot\s*= '.*#wwwroot = '%(www_root)s';#" %(app_path)s/config.php
fi
rm %(app_path)s/.lock
chown -R %(user)s:%(group)s %(app_path)s
su %(user)s --shell /bin/bash << 'EOF'
php %(app_path)s/admin/cli/install_database.php \\
--fullname="%(site_name)s" \\
--shortname="%(site_name)s" \\
--adminpass="%(password)s" \\
--adminemail="%(email)s" \\
--non-interactive \\
--agree-license \\
--allow-unstable
EOF
""") % context
)
def get_context(self, webapp):
context = super(MoodleBackend, self).get_context(webapp)
contents = webapp.content_set.all()
context.update({
'db_type': 'mysqli',
'db_name': webapp.data['db_name'],
'db_user': webapp.data['db_user'],
'password': webapp.data['password'],
'db_host': settings.WEBAPPS_DEFAULT_MYSQL_DATABASE_HOST,
'email': webapp.account.email,
'site_name': "%s Courses" % webapp.account.get_full_name(),
'cms_cache_dir': os.path.normpath(settings.WEBAPPS_CMS_CACHE_DIR),
'www_root': contents[0].website.get_absolute_url() if contents else 'http://empty'
})
return replace(context, '"', "'")

View File

@ -79,6 +79,7 @@ WEBAPPS_TYPES = Setting('WEBAPPS_TYPES', (
'orchestra.contrib.webapps.types.misc.WebalizerApp', 'orchestra.contrib.webapps.types.misc.WebalizerApp',
'orchestra.contrib.webapps.types.misc.SymbolicLinkApp', 'orchestra.contrib.webapps.types.misc.SymbolicLinkApp',
'orchestra.contrib.webapps.types.wordpress.WordPressApp', 'orchestra.contrib.webapps.types.wordpress.WordPressApp',
'orchestra.contrib.webapps.types.moodle.MoodleApp',
'orchestra.contrib.webapps.types.python.PythonApp', 'orchestra.contrib.webapps.types.python.PythonApp',
), ),
# lazy loading # lazy loading

View File

@ -0,0 +1,18 @@
from django.utils.translation import ugettext_lazy as _
from .cms import CMSApp
class MoodleApp(CMSApp):
name = 'moodle-php'
verbose_name = "Moodle"
help_text = _(
"This installs the latest version of Moodle into the webapp directory.<br>"
"A database and database user will automatically be created for this webapp.<br>"
"This installer creates a user 'admin' with a randomly generated password.<br>"
"The password will be visible in the 'password' field after the installer has finished."
)
icon = 'orchestra/icons/apps/Moodle.png'
def get_detail(self):
return self.instance.data.get('php_version', '')

View File

@ -0,0 +1,25 @@
import textwrap
from orchestra.contrib.orchestration import ServiceController
class MoodleWWWRootBackend(ServiceController):
"""
Configures Moodle site WWWRoot, without it Moodle refuses to work.
"""
verbose_name = "Moodle WWWRoot (required)"
model = 'websites.Content'
default_route_match = "content.webapp.type == 'moodle-php'"
def save(self, content):
context = self.get_context(content)
self.append(textwrap.dedent("""\
sed -i "s#wwwroot\s*= '.*#wwwroot = '%(url)s';#" %(app_path)s/config.php
""") % context
)
def get_context(self, content):
return {
'url': content.get_absolute_url(),
'app_path': content.webapp.get_path(),
}