[Fusionforge-commits] FusionForge branch GUM updated. 371341532ce12ff255cc4e202e79b2a22425b8b4

Sylvain Beucler beuc-inria at fusionforge.org
Wed Aug 20 18:50:11 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, GUM has been updated
       via  371341532ce12ff255cc4e202e79b2a22425b8b4 (commit)
       via  269dcb37b9222b9f3fe2f011719afc3305092806 (commit)
       via  25110b3efdf54180674e01e31cb1054c93e5534d (commit)
       via  c1236275fb1164da52918f0f7f43be102d882c93 (commit)
      from  7f816ff4fd0091334d804109d4e5ec688459048f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 371341532ce12ff255cc4e202e79b2a22425b8b4
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 18:49:57 2014 +0200

    httpd: don't use IfModule with mod-ssl since it's not reliable

diff --git a/src/templates/httpd.conf.d/ssl-really-on.inc b/src/templates/httpd.conf.d/ssl-really-on.inc
index 1af22b1..63e104f 100644
--- a/src/templates/httpd.conf.d/ssl-really-on.inc
+++ b/src/templates/httpd.conf.d/ssl-really-on.inc
@@ -1,4 +1,6 @@
-<IfModule mod_ssl.c>
+# Not using IfModule: the name changes between distros
+# and user can disable SSL in ssl-on.inc
+#<IfModule mod_ssl.c>
   SSLEngine on
   
   SSLCertificateFile {core/config_path}/ssl-cert.pem
@@ -14,7 +16,7 @@
   </Directory>
   
   SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-</IfModule>
+#</IfModule>
 
 <IfModule apache_ssl.c>
   SSLEnable

commit 269dcb37b9222b9f3fe2f011719afc3305092806
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 18:49:15 2014 +0200

    install: install forge_make_admin and forge_set_password in prefix/bin

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 31dee72..beb5420 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -40,9 +40,11 @@ install-common: install-config install-plugin-authbuiltin
 	$(MAKE) -C locale DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install
 	$(CP_R) VERSION bin common cronjobs post-install.d templates lib $(DESTDIR)$(pkgdatadir)/
 	$(INSTALL) -d -m 00755 $(DESTDIR)$(prefix)/bin/
-	ln -nfs $(pkgdatadir)/bin/forge_get_config $(DESTDIR)$(prefix)/bin/forge_get_config
-	ln -nfs $(pkgdatadir)/bin/forge_run_jon $(DESTDIR)$(prefix)/bin/forge_run_job
-	ln -nfs $(pkgdatadir)/bin/forge_run_plugin_job $(DESTDIR)$(prefix)/bin/forge_run_plugin_job
+	ln -nfs $(pkgdatadir)/bin/forge_get_config $(DESTDIR)$(prefix)/bin/
+	ln -nfs $(pkgdatadir)/bin/forge_run_job $(DESTDIR)$(prefix)/bin/
+	ln -nfs $(pkgdatadir)/bin/forge_run_plugin_job $(DESTDIR)$(prefix)/bin/
+	ln -nfs $(pkgdatadir)/bin/forge_make_admin $(DESTDIR)$(prefix)/bin/
+	ln -nfs $(pkgdatadir)/bin/forge_set_password $(DESTDIR)$(prefix)/bin/
 	$(INSTALL) -d -m 00755 $(DESTDIR)$(log_path)/
 
 install-db: install-base-dirs

commit 25110b3efdf54180674e01e31cb1054c93e5534d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 18:48:45 2014 +0200

    install: create admin user

diff --git a/src/post-install.d/db-populate.sh b/src/post-install.d/db-populate.sh
index de97aec..ef2d5c6 100755
--- a/src/post-install.d/db-populate.sh
+++ b/src/post-install.d/db-populate.sh
@@ -37,5 +37,12 @@ cat <<EOF > $PGPASSFILE
 $database_host:$database_port:$database_name:$database_user:$database_password
 EOF
 psql -h $database_host -p $database_port -U $database_user $database_name < $source_path/db/1-fusionforge-init.sql
+psql -h $database_host -p $database_port -U $database_user $database_name <<EOF
+INSERT INTO users (user_name, realname, firstname, lastname, email,
+    user_pw, unix_pw, status, theme_id)
+  VALUES ('admin', 'Forge Admin', 'Forge', 'Admin', 'root at localhost.localdomain',
+    'INVALID', 'INVALID', 'A', (SELECT theme_id FROM themes WHERE dirname='funky'));
+EOF
 rm -f $PGPASSFILE
 unset PGPASSFILE
+forge_make_admin admin

commit c1236275fb1164da52918f0f7f43be102d882c93
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Aug 20 18:25:16 2014 +0200

    install: bundle authbuiltin with web

diff --git a/src/GNUmakefile b/src/GNUmakefile
index e808fa1..31dee72 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -36,7 +36,7 @@ install-config: install-base-dirs
 			> $(DESTDIR)$(config_path)/config.ini; \
 	fi
 
-install-common: install-config
+install-common: install-config install-plugin-authbuiltin
 	$(MAKE) -C locale DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install
 	$(CP_R) VERSION bin common cronjobs post-install.d templates lib $(DESTDIR)$(pkgdatadir)/
 	$(INSTALL) -d -m 00755 $(DESTDIR)$(prefix)/bin/
diff --git a/src/post-install.d/httpd-configure.sh b/src/post-install.d/httpd-configure.sh
index dfc0729..ff00227 100755
--- a/src/post-install.d/httpd-configure.sh
+++ b/src/post-install.d/httpd-configure.sh
@@ -41,7 +41,6 @@ chown $apache_user: $data_path/forum/
 chown $apache_user: $data_path/tracker/
 
 # Plugins activation from the web UI
-install -d -m 00755 $source_path/www/plugins/
 chown $apache_user: $source_path/www/plugins/
 
 # Enable required modules
diff --git a/src/www/plugins/authbuiltin b/src/www/plugins/authbuiltin
new file mode 120000
index 0000000..5819945
--- /dev/null
+++ b/src/www/plugins/authbuiltin
@@ -0,0 +1 @@
+../../plugins/authbuiltin/www
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 src/GNUmakefile                              |   10 ++++++----
 src/post-install.d/db-populate.sh            |    7 +++++++
 src/post-install.d/httpd-configure.sh        |    1 -
 src/templates/httpd.conf.d/ssl-really-on.inc |    6 ++++--
 src/www/plugins/authbuiltin                  |    1 +
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 120000 src/www/plugins/authbuiltin


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list