diff --git a/env.sh b/env.sh deleted file mode 100644 index 5276d69c84..0000000000 --- a/env.sh +++ /dev/null @@ -1,36 +0,0 @@ -export DATABASE_URL="postgresql://postgres@localhost:5432" -export MASTER_KEY="3435tdfsdudebussylmaoxxt43" -export DOMAIN="localhost" -export SITE_NAME="Drama" -export GIPHY_KEY="3435tdfsdudebussylmaoxxt43" -export DISCORD_SERVER_ID="3435tdfsdudebussylmaoxxt43" -export DISCORD_CLIENT_ID="3435tdfsdudebussylmaoxxt43" -export DISCORD_CLIENT_SECRET="3435tdfsdudebussylmaoxxt43" -export DISCORD_BOT_TOKEN="3435tdfsdudebussylmaoxxt43" -export HCAPTCHA_SECRET="3435tdfsdudebussylmaoxxt43" -export YOUTUBE_KEY="3435tdfsdudebussylmaoxxt43" -export PUSHER_ID="3435tdfsdudebussylmaoxxt43" -export PUSHER_KEY="3435tdfsdudebussylmaoxxt43" -export IMGUR_KEY="3435tdfsdudebussylmaoxxt43" -export SPAM_SIMILARITY_THRESHOLD="0.5" -export SPAM_URL_SIMILARITY_THRESHOLD="0.1" -export SPAM_SIMILAR_COUNT_THRESHOLD="10" -export COMMENT_SPAM_SIMILAR_THRESHOLD="0.5" -export COMMENT_SPAM_COUNT_THRESHOLD="10" -export READ_ONLY="0" -export BOT_DISABLE="0" -export DEFAULT_TIME_FILTER="all" -export SLOGAN="Dude bussy lmao" -export GUMROAD_TOKEN="3435tdfsdudebussylmaoxxt43" -export GUMROAD_LINK="https://marsey1.gumroad.com/l/tfcvri" -export GUMROAD_ID="tfcvri" -export CARD_VIEW="1" -export DISABLE_DOWNVOTES="0" -export DUES="0" -export DEFAULT_THEME="midnight" -export DEFAULT_COLOR="ff66ac" # YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58 -export MAIL_USERNAME="blahblahblah@gmail.com" -export MAIL_PASSWORD="3435tdfsdudebussylmaoxxt43" -export DESCRIPTION="rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!" -export CF_KEY="3435tdfsdudebussylmaoxxt43" -export CF_ZONE="3435tdfsdudebussylmaoxxt43" diff --git a/readme.md b/readme.md index 411451f1c9..6ddb0f3ff0 100644 --- a/readme.md +++ b/readme.md @@ -6,19 +6,19 @@ Installing Drama locally is the fastest way to get the software up and running a --- -# Windows +# Windows/Linux/MacOS 1- Install Docker on your machine. -[Docker installation for Windows](https://docs.docker.com/docker-for-windows/install/) +[Docker installation](https://docs.docker.com/get-docker/) -2- Download Drama into your machine by running this command. +2- Download Drama into your machine by running this command in the terminal: ``` git clone https://github.com/Aevann1/Drama/ ``` -3- Press shift+right click inside the Drama code folder and run PowerShell. Then in PowerShell, run the following command: +3- Navigate to the "Drama" folder and run the following command in the terminal: ``` docker-compose up @@ -26,37 +26,4 @@ docker-compose up 4- That's it! Visit `localhost` in your browser. -5- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please edit the variables in the docker-compose.yml file and then restart the docker container from inside the docker app. - ---- - -# Ubuntu - -1- Download Drama into your machine by running this command. - -``` -git clone https://github.com/Aevann1/Drama/ /drama -``` - -2- Navigate to `/drama` - -``` -cd /drama -``` - -3- run the following command: - -``` -source setup -``` - -4- That's it. Visit `localhost` in your browser. - - -5- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please run this command and edit the variables: - -``` -nano /env.sh -``` - -then run `source /drama/restart` to apply the changes. +5- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please edit the variables in the docker-compose.yml file and then restart the docker container from inside the docker app. \ No newline at end of file diff --git a/restart b/restart deleted file mode 100644 index b4d929f0a1..0000000000 --- a/restart +++ /dev/null @@ -1,3 +0,0 @@ -source /env.sh -killall gunicorn -gunicorn files.__main__:app -k gevent -w 2 --reload -b localhost:80 --max-requests 1000 --max-requests-jitter 500 \ No newline at end of file diff --git a/setup b/setup deleted file mode 100644 index b38c62cddc..0000000000 --- a/setup +++ /dev/null @@ -1,18 +0,0 @@ -cd /drama -sudo apt update -sudo apt -y upgrade -sudo apt -y install postgresql postgresql-contrib -sudo apt -y install redis-server -cp pg_hba.conf /etc/postgresql/13/main/pg_hba.conf -sudo service postgresql restart -sudo psql -U postgres -f schema.sql postgres -sudo psql -U postgres -f seed-db.sql postgres -sudo apt -y install python3-pip -sudo pip3 install -r requirements.txt -sudo apt -y install gunicorn -sudo apt -y install ffmpeg -mkdir /songs -mkdir /images -cp ./env.sh /env.sh -. /env.sh -sudo -E gunicorn files.__main__:app -k gevent -w 2 --reload -b localhost:80 --max-requests 1000 --max-requests-jitter 500