aboutsummaryrefslogtreecommitdiffstats
path: root/maven-meeper/src
diff options
context:
space:
mode:
Diffstat (limited to 'maven-meeper/src')
-rw-r--r--maven-meeper/src/bin/synchronize.properties3
-rwxr-xr-xmaven-meeper/src/bin/synchronize.sh11
-rwxr-xr-xmaven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh10
-rw-r--r--maven-meeper/src/bin/synchronize/m1-m2-mod-rewrite-rules.txt (renamed from maven-meeper/src/bin/synchronize/ibiblio-htaccess)0
4 files changed, 14 insertions, 10 deletions
diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties
index 361464a32..82da23196 100644
--- a/maven-meeper/src/bin/synchronize.properties
+++ b/maven-meeper/src/bin/synchronize.properties
@@ -1,5 +1,8 @@
+#!/bin/sh
+
export CENTRAL_HOST=maven01.managed.contegix.com
export TOOLS_BASE=$HOME/components/maven-meeper/src/bin
export SYNC_TOOLS=$TOOLS_BASE/synchronize
export SYNCOPATE=$SYNC_TOOLS/syncopate
export REPOCLEAN=$TOOLS_BASE/m1-m2-conversion
+export M1_M2_REWRITE_RULES=$SYNC_TOOLS/m1-m2-mod-rewrite-rules.txt
diff --git a/maven-meeper/src/bin/synchronize.sh b/maven-meeper/src/bin/synchronize.sh
index 87dd4e1e9..f6a6de401 100755
--- a/maven-meeper/src/bin/synchronize.sh
+++ b/maven-meeper/src/bin/synchronize.sh
@@ -5,6 +5,7 @@
# 2. Convert Maven 1.x repository to Maven 2.x repository
# 3. Manual fixes
# 4. Sync the Maven 2.x repository to Ibiblio
+# 5. Copy the mod_rewrite rules to the Maven 2.x repository
# ------------------------------------------------------------------------
PID=$$
@@ -65,3 +66,13 @@ echo Synchronizing to ibiblio
)
retval=$?; if [ $retval != 0 ]; then exit $retval; fi
+# ------------------------------------------------------------------------
+# Copy the mod_rewrite rules to the Maven 1.x repository
+# ------------------------------------------------------------------------
+if [ "hostname" == $CENTRAL_HOST ]; then
+ cp $M1_M2_REWRITE_RULES $HOME/repository-staging/to-ibiblio/maven/.htaccess
+else
+ scp $M1_M2_REWRITE_RULES maven@maven.org:~maven/repository-staging/to-ibiblio/maven/.htaccess
+fi
+
+scp $M1_M2_REWRITE_RULES maven@login.ibiblio.org:/public/html/maven/.htaccess
diff --git a/maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh b/maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh
deleted file mode 100755
index bdfe41888..000000000
--- a/maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "`hostname`" == $CENTRAL_HOST ]; then
- cp ibiblio-htaccess $HOME/repository-staging/to-ibiblio/maven/.htaccess
-else
- scp ibiblio-htaccess maven@maven.org:~maven/repository-staging/to-ibiblio/maven/.htaccess
-fi
-
-scp ibiblio-htaccess maven@login.ibiblio.org:/public/html/maven/.htaccess
-
diff --git a/maven-meeper/src/bin/synchronize/ibiblio-htaccess b/maven-meeper/src/bin/synchronize/m1-m2-mod-rewrite-rules.txt
index 7baa12450..7baa12450 100644
--- a/maven-meeper/src/bin/synchronize/ibiblio-htaccess
+++ b/maven-meeper/src/bin/synchronize/m1-m2-mod-rewrite-rules.txt