Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
francois
slapos
Commits
c23d9919
Commit
c23d9919
authored
Oct 10, 2012
by
Viktor Horvath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mioga instance is happy with the database.
The Apache configuration must be handled next.
parent
59aee732
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
14 deletions
+20
-14
software/mioga/instance.cfg
software/mioga/instance.cfg
+0
-8
software/mioga/mioga-patch
software/mioga/mioga-patch
+20
-6
No files found.
software/mioga/instance.cfg
View file @
c23d9919
...
@@ -11,11 +11,3 @@ recipe = slapos.cookbook:softwaretype
...
@@ -11,11 +11,3 @@ recipe = slapos.cookbook:softwaretype
default = ${template-apacheperl:output}
default = ${template-apacheperl:output}
postgres = ${template-postgres:output}
postgres = ${template-postgres:output}
# [slap-connection]
# # part to migrate to new - separated words
# computer-id = $${slap_connection:computer_id}
# partition-id = $${slap_connection:partition_id}
# server-url = $${slap_connection:server_url}
# software-release-url = $${slap_connection:software_release_url}
# key-file = $${slap_connection:key_file}
# cert-file = $${slap_connection:cert_file}
\ No newline at end of file
software/mioga/mioga-patch
View file @
c23d9919
diff -r c0f4c1b8b448 Makefile.PL
diff -r c0f4c1b8b448 Makefile.PL
--- a/Makefile.PL Sat Oct 06 16:15:43 2012 +0200
--- a/Makefile.PL Sat Oct 06 16:15:43 2012 +0200
+++ b/Makefile.PL Wed Oct 10
01:52:02
2012 +0200
+++ b/Makefile.PL Wed Oct 10
23:27:10
2012 +0200
@@ -115,7 +115,7 @@
@@ -115,7 +115,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
sub MY::processPL {
sub MY::processPL {
...
@@ -24,7 +24,7 @@ diff -r c0f4c1b8b448 Makefile.PL
...
@@ -24,7 +24,7 @@ diff -r c0f4c1b8b448 Makefile.PL
fi \
fi \
diff -r c0f4c1b8b448 conf/Config.xml
diff -r c0f4c1b8b448 conf/Config.xml
--- a/conf/Config.xml Sat Oct 06 16:15:43 2012 +0200
--- a/conf/Config.xml Sat Oct 06 16:15:43 2012 +0200
+++ b/conf/Config.xml Wed Oct 10
01:52:02
2012 +0200
+++ b/conf/Config.xml Wed Oct 10
23:27:10
2012 +0200
@@ -37,6 +37,12 @@
@@ -37,6 +37,12 @@
xpath="/authentication"/>
xpath="/authentication"/>
...
@@ -40,7 +40,7 @@ diff -r c0f4c1b8b448 conf/Config.xml
...
@@ -40,7 +40,7 @@ diff -r c0f4c1b8b448 conf/Config.xml
xpath="/database/DBname"/>
xpath="/database/DBname"/>
diff -r c0f4c1b8b448 lib/Mioga2/Database.pm
diff -r c0f4c1b8b448 lib/Mioga2/Database.pm
--- a/lib/Mioga2/Database.pm Sat Oct 06 16:15:43 2012 +0200
--- a/lib/Mioga2/Database.pm Sat Oct 06 16:15:43 2012 +0200
+++ b/lib/Mioga2/Database.pm Wed Oct 10
01:52:02
2012 +0200
+++ b/lib/Mioga2/Database.pm Wed Oct 10
23:27:10
2012 +0200
@@ -61,7 +61,7 @@
@@ -61,7 +61,7 @@
my $self = { };
my $self = { };
bless($self, $class);
bless($self, $class);
...
@@ -62,9 +62,23 @@ diff -r c0f4c1b8b448 lib/Mioga2/Database.pm
...
@@ -62,9 +62,23 @@ diff -r c0f4c1b8b448 lib/Mioga2/Database.pm
$self->{dbh} = DBI->connect($datasource, $dbiUser, $dbiPassword);
$self->{dbh} = DBI->connect($datasource, $dbiUser, $dbiPassword);
diff -r c0f4c1b8b448 lib/Mioga2/InstanceList.pm
--- a/lib/Mioga2/InstanceList.pm Sat Oct 06 16:15:43 2012 +0200
+++ b/lib/Mioga2/InstanceList.pm Wed Oct 10 23:27:10 2012 +0200
@@ -423,7 +423,9 @@
$conf->RunHooks($self->{config}->{miogaconf});
# Run crawl.sh to initialize search engine database
- my $crawlcmd = $self->{config}->{miogaconf}->GetMiogaPrefix () . "/bin/mioga2_index.pl --conf=" . $self->{config}->GetMiogaConfPath () . ' ' . $self->Get ('ident');
+ my $crawlcmd = $self->{config}->{miogaconf}->GetMiogaPrefix () . "/bin/mioga2_index.pl --conf=" . $self->{config}->GetMiogaConfPath ()
+ . ' --search_conf=' . $self->{config}->{miogaconf}->GetInstallDir()."/conf/search_conf.xml"
+ . ' '. $self->Get ('ident');
system ("$crawlcmd");
}
elsif (scalar (keys (%{$self->{update}}))) {
diff -r c0f4c1b8b448 lib/MiogaConf.pm
diff -r c0f4c1b8b448 lib/MiogaConf.pm
--- a/lib/MiogaConf.pm Sat Oct 06 16:15:43 2012 +0200
--- a/lib/MiogaConf.pm Sat Oct 06 16:15:43 2012 +0200
+++ b/lib/MiogaConf.pm Wed Oct 10
01:52:02
2012 +0200
+++ b/lib/MiogaConf.pm Wed Oct 10
23:27:10
2012 +0200
@@ -811,6 +811,10 @@
@@ -811,6 +811,10 @@
my @missing;
my @missing;
my @missing_clib;
my @missing_clib;
...
@@ -86,7 +100,7 @@ diff -r c0f4c1b8b448 lib/MiogaConf.pm
...
@@ -86,7 +100,7 @@ diff -r c0f4c1b8b448 lib/MiogaConf.pm
my $version;
my $version;
diff -r c0f4c1b8b448 sql/Makefile
diff -r c0f4c1b8b448 sql/Makefile
--- a/sql/Makefile Sat Oct 06 16:15:43 2012 +0200
--- a/sql/Makefile Sat Oct 06 16:15:43 2012 +0200
+++ b/sql/Makefile Wed Oct 10
01:52:02
2012 +0200
+++ b/sql/Makefile Wed Oct 10
23:27:10
2012 +0200
@@ -18,9 +18,9 @@
@@ -18,9 +18,9 @@
if [ $(INIT_SQL) = 'yes' ] ; \
if [ $(INIT_SQL) = 'yes' ] ; \
then \
then \
...
@@ -102,7 +116,7 @@ diff -r c0f4c1b8b448 sql/Makefile
...
@@ -102,7 +116,7 @@ diff -r c0f4c1b8b448 sql/Makefile
echo "Update database"; \
echo "Update database"; \
diff -r c0f4c1b8b448 sql/schema_base.sql
diff -r c0f4c1b8b448 sql/schema_base.sql
--- a/sql/schema_base.sql Sat Oct 06 16:15:43 2012 +0200
--- a/sql/schema_base.sql Sat Oct 06 16:15:43 2012 +0200
+++ b/sql/schema_base.sql Wed Oct 10
01:52:02
2012 +0200
+++ b/sql/schema_base.sql Wed Oct 10
23:27:10
2012 +0200
@@ -429,10 +429,6 @@
@@ -429,10 +429,6 @@
END;
END;
' LANGUAGE 'plpgsql';
' LANGUAGE 'plpgsql';
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment