From 3977bb2a0b561a9d845172de58c6322f492660b1 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 2 Jan 2022 22:14:27 +0100 Subject: [PATCH] remove openshift support, nobody's using it --- .openshift/README.md | 3 - .openshift/action_hooks/README.md | 3 - .openshift/action_hooks/build | 36 --------- .openshift/action_hooks/deploy | 9 --- .openshift/action_hooks/start | 4 - .openshift/action_hooks/stop | 8 -- .openshift/config.mysql.yml | 113 ---------------------------- .openshift/cron/daily/.gitignore | 0 .openshift/cron/hourly/.gitignore | 0 .openshift/cron/minutely/.gitignore | 0 .openshift/cron/monthly/.gitignore | 0 .openshift/cron/weekly/README | 16 ---- .openshift/cron/weekly/chrono.dat | 1 - .openshift/cron/weekly/chronograph | 3 - .openshift/cron/weekly/jobs.allow | 12 --- .openshift/cron/weekly/jobs.deny | 7 -- .openshift/markers/README.md | 3 - .openshift/markers/java8 | 0 .openshift/settings.xml | 41 ---------- 19 files changed, 259 deletions(-) delete mode 100644 .openshift/README.md delete mode 100644 .openshift/action_hooks/README.md delete mode 100755 .openshift/action_hooks/build delete mode 100755 .openshift/action_hooks/deploy delete mode 100755 .openshift/action_hooks/start delete mode 100755 .openshift/action_hooks/stop delete mode 100644 .openshift/config.mysql.yml delete mode 100644 .openshift/cron/daily/.gitignore delete mode 100644 .openshift/cron/hourly/.gitignore delete mode 100644 .openshift/cron/minutely/.gitignore delete mode 100644 .openshift/cron/monthly/.gitignore delete mode 100644 .openshift/cron/weekly/README delete mode 100644 .openshift/cron/weekly/chrono.dat delete mode 100755 .openshift/cron/weekly/chronograph delete mode 100644 .openshift/cron/weekly/jobs.allow delete mode 100644 .openshift/cron/weekly/jobs.deny delete mode 100644 .openshift/markers/README.md delete mode 100644 .openshift/markers/java8 delete mode 100644 .openshift/settings.xml diff --git a/.openshift/README.md b/.openshift/README.md deleted file mode 100644 index 7ec66d79..00000000 --- a/.openshift/README.md +++ /dev/null @@ -1,3 +0,0 @@ -For information about .openshift directory, consult the documentation: - -http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory diff --git a/.openshift/action_hooks/README.md b/.openshift/action_hooks/README.md deleted file mode 100644 index 54131958..00000000 --- a/.openshift/action_hooks/README.md +++ /dev/null @@ -1,3 +0,0 @@ -For information about action hooks, consult the documentation: - -http://openshift.github.io/documentation/oo_user_guide.html#action-hooks diff --git a/.openshift/action_hooks/build b/.openshift/action_hooks/build deleted file mode 100755 index 9e117af7..00000000 --- a/.openshift/action_hooks/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -if [ ! -d $OPENSHIFT_DATA_DIR/jdk1.8.0_20 ] - then - cd $OPENSHIFT_DATA_DIR - wget http://www.java.net/download/jdk8u20/archive/b17/binaries/jdk-8u20-ea-bin-b17-linux-x64-04_jun_2014.tar.gz - tar xvf *.tar.gz - rm -f *.tar.gz -fi -if [ ! -d $OPENSHIFT_DATA_DIR/apache-maven-3.2.3 ] - then - cd $OPENSHIFT_DATA_DIR - wget http://archive.apache.org/dist/maven/maven-3/3.2.3/binaries/apache-maven-3.2.3-bin.tar.gz - tar xvf *.tar.gz - rm -f *.tar.gz -fi -export M2=$OPENSHIFT_DATA_DIR/apache-maven-3.2.3/bin -export JAVA_HOME=$OPENSHIFT_DATA_DIR/jdk1.8.0_20 -export PATH=$JAVA_HOME/bin:$M2:$PATH - -cd $OPENSHIFT_REPO_DIR -rm -rf $OPENSHIFT_REPO_DIR/node -rm -rf $OPENSHIFT_REPO_DIR/node_modules -rm -rf $OPENSHIFT_TMP_DIR/npm -rm -rf $OPENSHIFT_TMP_DIR/npmrc -rm -rf $OPENSHIFT_TMP_DIR/m2 -rm -rf $OPENSHIFT_TMP_DIR/local - -export NPM_CONFIG_PREFIX="$OPENSHIFT_TMP_DIR/npm" -export NPM_CONFIG_USERCONFIG="$OPENSHIFT_TMP_DIR/npmrc" -export NPM_CONFIG_CACHE="$OPENSHIFT_TMP_DIR/npm/cache" -export MAVEN_OPTS="-Dmaven.repo.local=$OPENSHIFT_TMP_DIR/m2" -export HOME="$OPENSHIFT_TMP_DIR/local" - -export NPM_CONFIG_ARCH="x64" - -mvn clean package -DskipTests -Dos.arch=x64 -s .openshift/settings.xml diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy deleted file mode 100755 index 9d146ad3..00000000 --- a/.openshift/action_hooks/deploy +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -cd $OPENSHIFT_REPO_DIR -sed -i 's/@OPENSHIFT_DIY_IP@/'"$OPENSHIFT_DIY_IP"'/g' .openshift/config.mysql.yml -sed -i 's/@OPENSHIFT_DIY_PORT@/'"$OPENSHIFT_DIY_PORT"'/g' .openshift/config.mysql.yml -sed -i 's/@OPENSHIFT_APP_DNS@/'"$OPENSHIFT_APP_DNS"'/g' .openshift/config.mysql.yml -sed -i 's/@OPENSHIFT_APP_NAME@/'"$OPENSHIFT_APP_NAME"'/g' .openshift/config.mysql.yml -sed -i 's/@OPENSHIFT_MYSQL_DB_HOST@/'"$OPENSHIFT_MYSQL_DB_HOST"'/g' .openshift/config.mysql.yml -sed -i 's/@OPENSHIFT_MYSQL_DB_USERNAME@/'"$OPENSHIFT_MYSQL_DB_USERNAME"'/g' .openshift/config.mysql.yml -sed -i 's/@OPENSHIFT_MYSQL_DB_PASSWORD@/'"$OPENSHIFT_MYSQL_DB_PASSWORD"'/g' .openshift/config.mysql.yml diff --git a/.openshift/action_hooks/start b/.openshift/action_hooks/start deleted file mode 100755 index a1562fc5..00000000 --- a/.openshift/action_hooks/start +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -cd $OPENSHIFT_REPO_DIR -export JAVA_HOME=$OPENSHIFT_DATA_DIR/jdk1.8.0_20 -nohup $JAVA_HOME/bin/java -jar target/commafeed.jar server .openshift/config.mysql.yml > ${OPENSHIFT_DIY_LOG_DIR}/commafeed.log 2>&1 & diff --git a/.openshift/action_hooks/stop b/.openshift/action_hooks/stop deleted file mode 100755 index 3cbaaff0..00000000 --- a/.openshift/action_hooks/stop +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -source $OPENSHIFT_CARTRIDGE_SDK_BASH -if [ -z "$(ps -ef | grep commafeed.jar | grep -v grep)" ] -then - client_result "Application is already stopped" -else - kill `ps -ef | grep commafeed.jar | grep -v grep | awk '{ print $2 }'` > /dev/null 2>&1 -fi diff --git a/.openshift/config.mysql.yml b/.openshift/config.mysql.yml deleted file mode 100644 index c312270d..00000000 --- a/.openshift/config.mysql.yml +++ /dev/null @@ -1,113 +0,0 @@ -# CommaFeed settings -# ------------------ -app: - # url used to access commafeed - publicUrl: https://@OPENSHIFT_APP_DNS@/ - - # wether to allow user registrations - allowRegistrations: false - - # create a demo account the first time the app starts - createDemoAccount: false - - # put your google analytics tracking code here - googleAnalyticsTrackingCode: - - # put your google server key (used for youtube favicon fetching) - googleAuthKey: - - # number of http threads - backgroundThreads: 3 - - # number of database updating threads - databaseUpdateThreads: 1 - - # settings for sending emails (password recovery) - smtpHost: - smtpPort: - smtpTls: false - smtpUserName: - smtpPassword: - - # wether this commafeed instance has a lot of feeds to refresh - # leave this to false in almost all cases - heavyLoad: false - - # minimum amount of time commafeed will wait before refreshing the same feed - refreshIntervalMinutes: 15 - - # wether to enable pubsub - # probably not needed if refreshIntervalMinutes is low - pubsubhubbub: false - - # if enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser - # useful if commafeed is usually accessed through a restricting proxy - imageProxyEnabled: false - - # database query timeout (in milliseconds), 0 to disable - queryTimeout: 0 - - # time to keep unread statuses (in days), 0 to disable - keepStatusDays: 0 - - # entries to keep per feed, old entries will be deleted, 0 to disable - maxFeedCapacity: 500 - - # cache service to use, possible values are 'noop' and 'redis' - cache: noop - - # announcement string displayed on the main page - announcement: - -# Database connection -# ------------------- -# for MySQL -# driverClass is com.mysql.jdbc.Driver -# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true -# -# for PostgreSQL -# driverClass is org.postgresql.Driver -# url is jdbc:postgresql://localhost:5432/commafeed -# -# for Microsoft SQL Server -# driverClass is net.sourceforge.jtds.jdbc.Driver -# url is jdbc:jtds:sqlserver://localhost:1433/commafeed;instance= - -database: - driverClass: com.mysql.jdbc.Driver - url: jdbc:mysql://@OPENSHIFT_MYSQL_DB_HOST@/@OPENSHIFT_APP_NAME@?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true - user: @OPENSHIFT_MYSQL_DB_USERNAME@ - password: @OPENSHIFT_MYSQL_DB_PASSWORD@ - properties: - charSet: UTF-8 - maxWaitForConnection: 1s - validationQuery: "/* CommaFeed Health Check */ SELECT 1" - minSize: 1 - maxSize: 50 - checkConnectionWhileIdle: true - maxConnectionAge: 30m - -server: - applicationConnectors: - - type: http - port: @OPENSHIFT_DIY_PORT@ - bindHost: @OPENSHIFT_DIY_IP@ - adminConnectors: - - type: http - port: 15000 - bindHost: @OPENSHIFT_DIY_IP@ -logging: - level: WARN - loggers: - com.commafeed: INFO - liquibase: INFO - io.dropwizard.server.ServerFactory: INFO - appenders: - - type: console - - type: file - currentLogFilename: log/commafeed.log - threshold: ALL - archive: true - archivedLogFilenamePattern: log/commafeed-%d.log - archivedFileCount: 5 - timeZone: UTC diff --git a/.openshift/cron/daily/.gitignore b/.openshift/cron/daily/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/.openshift/cron/hourly/.gitignore b/.openshift/cron/hourly/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/.openshift/cron/minutely/.gitignore b/.openshift/cron/minutely/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/.openshift/cron/monthly/.gitignore b/.openshift/cron/monthly/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/.openshift/cron/weekly/README b/.openshift/cron/weekly/README deleted file mode 100644 index 7c3e659f..00000000 --- a/.openshift/cron/weekly/README +++ /dev/null @@ -1,16 +0,0 @@ -Run scripts or jobs on a weekly basis -===================================== -Any scripts or jobs added to this directory will be run on a scheduled basis -(weekly) using run-parts. - -run-parts ignores any files that are hidden or dotfiles (.*) or backup -files (*~ or *,) or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} and handles -the files named jobs.deny and jobs.allow specially. - -In this specific example, the chronograph script is the only script or job file -executed on a weekly basis (due to white-listing it in jobs.allow). And the -README and chrono.dat file are ignored either as a result of being black-listed -in jobs.deny or because they are NOT white-listed in the jobs.allow file. - -For more details, please see ../README.cron file. - diff --git a/.openshift/cron/weekly/chrono.dat b/.openshift/cron/weekly/chrono.dat deleted file mode 100644 index fc4abb87..00000000 --- a/.openshift/cron/weekly/chrono.dat +++ /dev/null @@ -1 +0,0 @@ -Time And Relative D...n In Execution (Open)Shift! diff --git a/.openshift/cron/weekly/chronograph b/.openshift/cron/weekly/chronograph deleted file mode 100755 index 61de949f..00000000 --- a/.openshift/cron/weekly/chronograph +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "`date`: `cat $(dirname \"$0\")/chrono.dat`" diff --git a/.openshift/cron/weekly/jobs.allow b/.openshift/cron/weekly/jobs.allow deleted file mode 100644 index 8d32abc7..00000000 --- a/.openshift/cron/weekly/jobs.allow +++ /dev/null @@ -1,12 +0,0 @@ -# -# Script or job files listed in here (one entry per line) will be -# executed on a weekly-basis. -# -# Example: The chronograph script will be executed weekly but the README -# and chrono.dat files in this directory will be ignored. -# -# The README file is actually ignored due to the entry in the -# jobs.deny which is checked before jobs.allow (this file). -# -chronograph - diff --git a/.openshift/cron/weekly/jobs.deny b/.openshift/cron/weekly/jobs.deny deleted file mode 100644 index 73c94500..00000000 --- a/.openshift/cron/weekly/jobs.deny +++ /dev/null @@ -1,7 +0,0 @@ -# -# Any script or job files listed in here (one entry per line) will NOT be -# executed (read as ignored by run-parts). -# - -README - diff --git a/.openshift/markers/README.md b/.openshift/markers/README.md deleted file mode 100644 index 45814da3..00000000 --- a/.openshift/markers/README.md +++ /dev/null @@ -1,3 +0,0 @@ -For information about markers, consult the documentation: - -http://openshift.github.io/documentation/oo_user_guide.html#markers diff --git a/.openshift/markers/java8 b/.openshift/markers/java8 deleted file mode 100644 index e69de29b..00000000 diff --git a/.openshift/settings.xml b/.openshift/settings.xml deleted file mode 100644 index 397d208f..00000000 --- a/.openshift/settings.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - nexus - central - http://mirror1.ops.rhcloud.com/nexus/content/groups/public - - - - - nexus - - - central - http://central - - true - - - true - - - - - - central - http://central - - true - - - true - - - - - - - nexus - -