Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some tweaks for general setup #156

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Some tweaks for general setup #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50944ae
Fix shebang typo
deathaxe Aug 18, 2022
4d65de6
Fix failing postgresql dev-server start
deathaxe Aug 19, 2022
8b8011f
Fix data base creation for development environment
deathaxe Aug 18, 2022
ba3c5d8
Add access tokens to secrets-example.yml
deathaxe Aug 19, 2022
8a28f2d
Use subprocess.check_output to call git
deathaxe Aug 19, 2022
fab0653
Fix git warning when pulling package_control_channel
deathaxe Aug 19, 2022
f5a8ed2
Fix indentation issues
deathaxe Aug 19, 2022
0313b36
Fix chown argument
deathaxe Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions app/tasks/crawl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@
git_binary = path
break

args = [git_binary, 'pull', 'origin', 'master']
proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, cwd=dirname)
output, _ = proc.communicate()
print(output.decode(encoding='utf-8'))

args = [git_binary, 'pull', '--ff-only', 'origin', 'master']
print(subprocess.check_output(args, cwd=dirname, encoding='utf-8'))

if explicit_package:
valid_sources = package.sources.sources_for(explicit_package)
Expand Down
29 changes: 25 additions & 4 deletions dev-servers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,32 @@ mkdir -p "$PROJ_DIR/data/pgsql"
mkdir -p "$PROJ_DIR/data/redis"
mkdir -p "$PROJ_DIR/data/logs"

if [[ ! -d "$PROJ_DIR/data/pgsql/base" ]]; then
initdb "$PROJ_DIR/data/pgsql"
createdb -U postgres -E 'UTF-8' package_control
# Create run directory with elevated privileges
PGSQL_RUN_DIR=/var/run/postgresql
if [[ ! -d "$PGSQL_RUN_DIR" ]]; then
sudo mkdir -p "$PGSQL_RUN_DIR"
sudo chown $(whoami) "$PGSQL_RUN_DIR"
fi

HAS_DB=1
if [[ ! -e "$PROJ_DIR/data/pgsql/PG_VERSION" ]]; then
HAS_DB=0
initdb -U postgres -E UTF-8 -D "$PROJ_DIR/data/pgsql"
sleep 1
fi

pg_ctl -D "$PROJ_DIR/data/pgsql" -l "$PROJ_DIR/data/logs/pgsql.log" start
redis-server --port 6379

if ((!HAS_DB)); then
createdb -U postgres -E UTF-8 package_control
psql -U postgres -d package_control -f "$PROJ_DIR/setup/sql/up.sql"
fi

redis-server --port 6379 --daemonize yes --loglevel warning --logfile $PROJ_DIR/data/logs/redis.log

# enter sql shell
psql -U postgres package_control

# shutdown servers
redis-cli -h 127.0.0.1 -p 6379 shutdown
pg_ctl -D "$PROJ_DIR/data/pgsql" stop
4 changes: 2 additions & 2 deletions dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/usr/bin/env bash
#!/usr/bin/env bash

tmux has-session -t packagecontrol
if [[ $? != 0 ]]; then
Expand All @@ -12,7 +12,7 @@ if [[ $? != 0 ]]; then
tmux select-layout -t packagecontrol tiled

sleep 0.6
tmux send-keys -t packagecontrol:0.0 'psql -U postgres package_control' C-m
tmux send-keys -t packagecontrol:0.0 './dev-servers.sh' C-m
tmux send-keys -t packagecontrol:0.1 '. venv/bin/activate' C-m
tmux send-keys -t packagecontrol:0.2 '. venv/bin/activate' C-m
tmux send-keys -t packagecontrol:0.3 '. venv/bin/activate' C-m
Expand Down
3 changes: 3 additions & 0 deletions secrets-example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
bitbucket_access_token_wbond: "Enter your personal access token here"
github_access_token_packagecontrol-bot: "Enter your personal access token here"
gitlab_access_token_wbond: "Enter your personal access token here"
github_client_id: "Visit https://github.com/settings/applications to register an application"
github_client_secret: "Visit https://github.com/settings/applications to register an application"
rollbar_key: "Visit https://rollbar.com/signup/ and sign up for a free tier account"
Expand Down
24 changes: 12 additions & 12 deletions servers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if [[ $TASK == "start" ]]; then

if [[ ! -f "$PROJ_DIR/data/ssl/dhparam.pem" ]]; then
echo -n "Generating dhparam for TLS ..."
openssl dhparam -out $PROJ_DIR/data/ssl/dhparam.pem 2048
openssl dhparam -out $PROJ_DIR/data/ssl/dhparam.pem 2048
echo " done"
fi

Expand Down Expand Up @@ -97,17 +97,17 @@ if [[ $TASK == "start" ]]; then
listen 443 ssl http2;
server_name dev.packagecontrol.io;

ssl_certificate $PROJ_DIR/data/ssl/fullchain.pem;
ssl_certificate_key $PROJ_DIR/data/ssl/privkey.pem;
ssl_dhparam $PROJ_DIR/data/ssl/dhparam.pem;
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
ssl_prefer_server_ciphers on;
ssl_session_timeout 5m;

ssl_stapling on;
ssl_stapling_verify on;
ssl_trusted_certificate $PROJ_DIR/data/ssl/fullchain.pem;
ssl_certificate $PROJ_DIR/data/ssl/fullchain.pem;
ssl_certificate_key $PROJ_DIR/data/ssl/privkey.pem;
ssl_dhparam $PROJ_DIR/data/ssl/dhparam.pem;
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
ssl_prefer_server_ciphers on;
ssl_session_timeout 5m;

ssl_stapling on;
ssl_stapling_verify on;
ssl_trusted_certificate $PROJ_DIR/data/ssl/fullchain.pem;

root $PROJ_DIR/public;

Expand Down