Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SlapOS Develop
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
SlapOS Develop
Commits
dbbd9a96
Commit
dbbd9a96
authored
Oct 10, 2012
by
Viktor Horvath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include Perl in Postgres
parent
5d42da92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
56 additions
and
6 deletions
+56
-6
component/postgresql/buildout.cfg
component/postgresql/buildout.cfg
+3
-2
software/mioga/mioga-patch
software/mioga/mioga-patch
+53
-4
No files found.
component/postgresql/buildout.cfg
View file @
dbbd9a96
...
@@ -4,13 +4,14 @@ extends =
...
@@ -4,13 +4,14 @@ extends =
../readline/buildout.cfg
../readline/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
../ncurses/buildout.cfg
../ncurses/buildout.cfg
../perl/buildout.cfg
parts = postgresql
parts = postgresql
[postgresql]
[postgresql]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://ftp.postgresql.org/pub/source/v9.1.6/postgresql-9.1.6.tar.bz2
url = http://ftp.postgresql.org/pub/source/v9.1.6/postgresql-9.1.6.tar.bz2
md5sum = 000755f66c0de58bbd4cd2b89b45b8e2
md5sum = 000755f66c0de58bbd4cd2b89b45b8e2
configure-options = --with-openssl
configure-options = --with-openssl
--with-perl
environment =
environment =
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
-L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
software/mioga/mioga-patch
View file @
dbbd9a96
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:
19:50
2012 +0200
+++ b/Makefile.PL Wed Oct 10 01:
52:02
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:
19:50
2012 +0200
+++ b/conf/Config.xml Wed Oct 10 01:
52:02
2012 +0200
@@ -37,6 +37,12 @@
@@ -37,6 +37,12 @@
xpath="/authentication"/>
xpath="/authentication"/>
...
@@ -38,9 +38,33 @@ diff -r c0f4c1b8b448 conf/Config.xml
...
@@ -38,9 +38,33 @@ diff -r c0f4c1b8b448 conf/Config.xml
<parameter name="db_name" question=" Name of Mioga database ?"
<parameter name="db_name" question=" Name of Mioga database ?"
type="text" default="mioga2"
type="text" default="mioga2"
xpath="/database/DBname"/>
xpath="/database/DBname"/>
diff -r c0f4c1b8b448 lib/Mioga2/Database.pm
--- 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
@@ -61,7 +61,7 @@
my $self = { };
bless($self, $class);
- for my $attr (qw/DBIlogin DBIpasswd DBIdriver DBname/) {
+ for my $attr (qw/DBhost DBport DBIlogin DBIpasswd DBIdriver DBname/) {
if (!defined ($attributes{$attr})) {
throw Mioga2::Exception::DB ("[Mioga2::Database::new]", "Cannot connect to database: " . $DBI::errstr);
}
@@ -72,8 +72,10 @@
my $dbiPassword = $self->{database}->{DBIpasswd};
my $dbDriver = $self->{database}->{DBIdriver};
my $dbName = $self->{database}->{DBname};
+ my $dbHost = $self->{database}->{DBhost};
+ my $dbPort = $self->{database}->{DBport};
- my $datasource = "dbi:$dbDriver:dbname=$dbName";
+ my $datasource = "dbi:$dbDriver:dbname=$dbName;host=$dbHost;port=$dbPort";
$self->{dbh} = DBI->connect($datasource, $dbiUser, $dbiPassword);
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:
19:50
2012 +0200
+++ b/lib/MiogaConf.pm Wed Oct 10 01:
52:02
2012 +0200
@@ -811,6 +811,10 @@
@@ -811,6 +811,10 @@
my @missing;
my @missing;
my @missing_clib;
my @missing_clib;
...
@@ -62,7 +86,7 @@ diff -r c0f4c1b8b448 lib/MiogaConf.pm
...
@@ -62,7 +86,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:
19:50
2012 +0200
+++ b/sql/Makefile Wed Oct 10 01:
52:02
2012 +0200
@@ -18,9 +18,9 @@
@@ -18,9 +18,9 @@
if [ $(INIT_SQL) = 'yes' ] ; \
if [ $(INIT_SQL) = 'yes' ] ; \
then \
then \
...
@@ -76,3 +100,28 @@ diff -r c0f4c1b8b448 sql/Makefile
...
@@ -76,3 +100,28 @@ diff -r c0f4c1b8b448 sql/Makefile
perl -w -I../lib initdb.pl ; \
perl -w -I../lib initdb.pl ; \
elif [ $(INIT_SQL) != 'noupdate' ]; then \
elif [ $(INIT_SQL) != 'noupdate' ]; then \
echo "Update database"; \
echo "Update database"; \
diff -r c0f4c1b8b448 sql/schema_base.sql
--- 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
@@ -429,10 +429,6 @@
END;
' LANGUAGE 'plpgsql';
-CREATE TRIGGER m_group_base_default_profile_id_check
- BEFORE DELETE ON m_profile FOR EACH ROW
- EXECUTE PROCEDURE check_group_base_default_profile_id ();
-
CREATE OR REPLACE FUNCTION check_group_base_mioga_id () RETURNS trigger AS '
DECLARE
@@ -839,6 +835,10 @@
);
create unique index m_profile_ident_group_index on m_profile (ident, group_id);
+CREATE TRIGGER m_group_base_default_profile_id_check
+ BEFORE DELETE ON m_profile FOR EACH ROW
+ EXECUTE PROCEDURE check_group_base_default_profile_id ();
+
--
-- Add referencial integrity on default_profile_id in m_group_base
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