From c61ef18c8389225bc6aacf2cf6e52f5e7cb6c79e Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 18 Oct 2013 09:03:53 +0200 Subject: [PATCH] Ajaxplorer is now Pydio --- .../defaults/{ajaxplorer => pydio}/AliasOnPrimary | 0 .../defaults/{ajaxplorer => pydio}/Authentication | 0 .../defaults/{ajaxplorer => pydio}/DefaultLanguage | 0 .../db/configuration/defaults/{ajaxplorer => pydio}/Title | 0 .../defaults/{ajaxplorer => pydio}/WelcomMessage | 0 .../db/configuration/migrate/{90Ajaxplorer => 90Pydio} | 4 ++-- .../e-smith/events/actions/ipasserelle-webapps-init-domains | 12 +++++++++--- .../lib/lemonldap-ng/conf/lmConf/{040ajaxplorer => 040pydio} | 0 8 files changed, 11 insertions(+), 5 deletions(-) rename root/etc/e-smith/db/configuration/defaults/{ajaxplorer => pydio}/AliasOnPrimary (100%) rename root/etc/e-smith/db/configuration/defaults/{ajaxplorer => pydio}/Authentication (100%) rename root/etc/e-smith/db/configuration/defaults/{ajaxplorer => pydio}/DefaultLanguage (100%) rename root/etc/e-smith/db/configuration/defaults/{ajaxplorer => pydio}/Title (100%) rename root/etc/e-smith/db/configuration/defaults/{ajaxplorer => pydio}/WelcomMessage (100%) rename root/etc/e-smith/db/configuration/migrate/{90Ajaxplorer => 90Pydio} (61%) rename root/etc/e-smith/templates/var/lib/lemonldap-ng/conf/lmConf/{040ajaxplorer => 040pydio} (100%) diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/AliasOnPrimary b/root/etc/e-smith/db/configuration/defaults/pydio/AliasOnPrimary similarity index 100% rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/AliasOnPrimary rename to root/etc/e-smith/db/configuration/defaults/pydio/AliasOnPrimary diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/Authentication b/root/etc/e-smith/db/configuration/defaults/pydio/Authentication similarity index 100% rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/Authentication rename to root/etc/e-smith/db/configuration/defaults/pydio/Authentication diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/DefaultLanguage b/root/etc/e-smith/db/configuration/defaults/pydio/DefaultLanguage similarity index 100% rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/DefaultLanguage rename to root/etc/e-smith/db/configuration/defaults/pydio/DefaultLanguage diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/Title b/root/etc/e-smith/db/configuration/defaults/pydio/Title similarity index 100% rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/Title rename to root/etc/e-smith/db/configuration/defaults/pydio/Title diff --git a/root/etc/e-smith/db/configuration/defaults/ajaxplorer/WelcomMessage b/root/etc/e-smith/db/configuration/defaults/pydio/WelcomMessage similarity index 100% rename from root/etc/e-smith/db/configuration/defaults/ajaxplorer/WelcomMessage rename to root/etc/e-smith/db/configuration/defaults/pydio/WelcomMessage diff --git a/root/etc/e-smith/db/configuration/migrate/90Ajaxplorer b/root/etc/e-smith/db/configuration/migrate/90Pydio similarity index 61% rename from root/etc/e-smith/db/configuration/migrate/90Ajaxplorer rename to root/etc/e-smith/db/configuration/migrate/90Pydio index 46a1644..da0e9ea 100644 --- a/root/etc/e-smith/db/configuration/migrate/90Ajaxplorer +++ b/root/etc/e-smith/db/configuration/migrate/90Pydio @@ -1,6 +1,6 @@ { - my $rec = $DB->get('ajaxplorer') - || $DB->new_record('ajaxplorer', {type => 'webapp'}); + my $rec = $DB->get('pydio') + || $DB->new_record('pydio', {type => 'webapp'}); my $url = $rec->prop('LogoutUrl'); diff --git a/root/etc/e-smith/events/actions/ipasserelle-webapps-init-domains b/root/etc/e-smith/events/actions/ipasserelle-webapps-init-domains index 50f059a..2c5c667 100644 --- a/root/etc/e-smith/events/actions/ipasserelle-webapps-init-domains +++ b/root/etc/e-smith/events/actions/ipasserelle-webapps-init-domains @@ -74,10 +74,10 @@ if (!$vhost){ $d->new_record("echange.$domain",{ type => 'domain', Content => 'Primary', - Description => "Ajaxplorer", + Description => "Pydio", Nameservers => 'internet', TemplatePath => 'WebAppVirtualHost', - DocumentRoot => '/usr/share/ajaxplorer', + DocumentRoot => '/usr/share/pydio', Removable => 'yes', Authentication => 'LemonLDAP' }); @@ -86,7 +86,13 @@ if (!$vhost){ die "Failed to create domain echange.$domain\n"; } } - +elsif (($vhost->prop('DocumentRoot') || '/usr/share/pydio') eq '/usr/share/ajaxplorer'){ + $d->set_prop("echange.$domain", 'DocumentRoot', '/usr/share/pydio'); + $d->set_prop("echange.$domain", 'Description', 'Pydio'); + unless ( system("/sbin/e-smith/signal-event", "domain-modify", "echange.$domain") == 0 ){ + die "Failed to update domain echange.$domain\n"; + } +} $vhost = $d->get("wiki.$domain"); diff --git a/root/etc/e-smith/templates/var/lib/lemonldap-ng/conf/lmConf/040ajaxplorer b/root/etc/e-smith/templates/var/lib/lemonldap-ng/conf/lmConf/040pydio similarity index 100% rename from root/etc/e-smith/templates/var/lib/lemonldap-ng/conf/lmConf/040ajaxplorer rename to root/etc/e-smith/templates/var/lib/lemonldap-ng/conf/lmConf/040pydio