From 6b37c92f722eef842767544c860c468a993e3b80 Mon Sep 17 00:00:00 2001 From: aymhce Date: Wed, 8 Feb 2017 20:02:56 +0000 Subject: [PATCH] broken app, test new integration --- conf/database.yml | 4 +- conf/diaspora.yml | 580 ++++++++++++++++++++++++++++++++++------------ scripts/install | 12 +- 3 files changed, 443 insertions(+), 153 deletions(-) diff --git a/conf/database.yml b/conf/database.yml index 06aac2a..7da801a 100644 --- a/conf/database.yml +++ b/conf/database.yml @@ -5,8 +5,8 @@ mysql: &mysql username: "DBUSERTOCHANGE" password: "DBPASSTOCHANGE" # socket: /tmp/mysql.sock - charset: utf8 - collation: utf8_bin + charset: utf8mb4 + collation: utf8mb4_bin postgres: &postgres adapter: postgresql diff --git a/conf/diaspora.yml b/conf/diaspora.yml index 488b754..89e8ab4 100644 --- a/conf/diaspora.yml +++ b/conf/diaspora.yml @@ -24,11 +24,11 @@ ## heroku config:set SERVICES_FACEBOOK_APP_ID=yourappid SERVICES_FACEBOOK_SECRET=yourappsecret configuration: ## Section - + ## You need to change or at least review the settings in this section - ## in order for your pod to work + ## in order for your pod to work. environment: ## Section - + ## Set the hostname of the machine you're running Diaspora on, as seen ## from the internet. This should be the URL you want to use to ## access the pod. So if you plan to use a reverse proxy, it should be @@ -37,66 +37,78 @@ configuration: ## Section ## If you do change the URL, you will have to start again as the URL ## will be hardcoded into the database. url: "FULLURLTOCHANGE" - + ## Set the bundle of certificate authorities (CA) certificates. ## This is specific to your operating system. ## Examples (uncomment the relevant one or add your own): ## For Debian, Ubuntu, Archlinux, Gentoo (package ca-certificates): - certificate_authorities: '/etc/ssl/certs/ca-certificates.crt' + #certificate_authorities: '/etc/ssl/certs/ca-certificates.crt' ## For CentOS, Fedora: #certificate_authorities: '/etc/pki/tls/certs/ca-bundle.crt' - - ## URL for a remote Redis (default=localhost) + + ## URL for a remote Redis (default=localhost). ## Don't forget to restrict IP access if you uncomment these! #redis: 'redis://example_host' #redis: 'redis://username:password@host:6379/0' #redis: 'unix:///tmp/redis.sock' - - ## Require SSL (default=true) - ## When set, your pod will force the use of HTTPS in production mode. Since - ## OAuth2 requires SSL Diaspora's future API might not work if you're not using - ## SSL. Also there is no guarantee that posting to services will be possible - ## if SSL is disabled. Do not change this default unless you are sure! - require_ssl: false - - ## Single-process mode (default=false) - ## If set to true Diaspora will work with just the appserver (Unicorn by default) - ## running. However, this makes it quite slow as intensive jobs must be run - ## all the time inside the request cycle. We strongly recommended you leave - ## this disabled for production setups. Set to true to enable. + + ## Require SSL (default=true). + ## When set, your pod will force the use of HTTPS in production mode. + ## Since OAuth2 requires SSL, Diaspora's future API might not work if + ## you're not using SSL. Also there is no guarantee that posting to + ## services will be possible if SSL is disabled. + ## Do not change this default unless you are sure! + #require_ssl: true + + ## Single-process mode (default=false). + ## If set to true, Diaspora will work with just the appserver (Unicorn by + ## default) running. However, this makes it quite slow as intensive jobs + ## must be run all the time inside the request cycle. We strongly + ## recommended you leave this disabled for production setups. + ## Set to true to enable. #single_process_mode: false ## Sidekiq - background processing sidekiq: ## Section - ## Number of parallel threads Sidekiq uses (default=5) - ## If you touch this please set the pool setting in your database.yml to - ## a value that's at minimum close to this! You can safely increase it - ## to 25 and more on a medium-sized pod. This applies per started Sidekiq - ## worker, so if you set it to 25 and start two workers you'll process - ## up to 50 jobs in parallel. + ## Number of parallel threads Sidekiq uses (default=5). + ## If you touch this, please set the pool setting in your database.yml + ## to a value that's at minimum close to this! You can safely increase + ## it to 25 and more on a medium-sized pod. This applies per started + ## Sidekiq worker, so if you set it to 25 and start two workers, you'll + ## process up to 50 jobs in parallel. #concurrency: 5 - ## Number of times a job is retried (default=10) + ## Number of times a job is retried (default=10). ## There's an exponential effect to this: if you set this too high you ## might get too many jobs building up in the queue. ## Set it to false to disable it completely. #retry: 10 - ## Namespace to use in Redis. Useful if you need to run - ## multiple instances of Diaspora using the same Redis instance. - #namespace: "diaspora" - - ## Lines of backtrace that are stored on failure (default=15) - ## Set n to the required value. Set this to false to reduce memory + ## Lines of backtrace that are stored on failure (default=15). + ## Set n to the required value. Set this to false to reduce Redis memory ## usage (and log size) if you're not interested in this data. #backtrace: 15 + ## Number of jobs to keep in the dead queue (default=5000). + ## Jobs get into the dead queue after they failed and exhausted all retries. + ## Increasing this setting will increase the memory usage of Redis. + ## Once gone from the dead queue, a failed job is permanently lost and + ## cannot be retried manually. + # dead_jobs_limit: 1000 + + ## Number of seconds a job remains in the dead queue (default=3628800 (six weeks)). + ## Jobs get into the dead queue after they failed and exhausted all retries. + ## Increasing this setting will increase the memory usage of Redis. + ## Once gone from the dead queue, a failed job is permanently lost and + ## cannot be retried manually. + # dead_jobs_timeout: 15552000 # 6 months + ## Log file for Sidekiq (default="log/sidekiq.log") #log: "log/sidekiq.log" - + ## Use Amazon S3 instead of your local filesystem - ## to handle uploaded pictures (disabled by default) + ## to handle uploaded pictures (disabled by default). s3: ## Section #enable: true @@ -105,84 +117,187 @@ configuration: ## Section #bucket: 'my_photos' #region: 'us-east-1' - ## Use max-age header on Amazon S3 resources (default=true) + ## Use max-age header on Amazon S3 resources (default=true). ## When true, this allows locally cached images to be served for up to - ## 1 year. This can improve load speed and save requests to the image host. - ## Set to false to revert to browser defaults (usually less than 1 year). + ## one year. This can improve load speed and save requests to the image + ## host. Set to false to revert to browser defaults (usually less than + ## one year). #cache : true - - ## Set redirect URL for an external image host (Amazon S3 or other) + + ## Set redirect URL for an external image host (Amazon S3 or other). ## If hosting images for your pod on an external server (even your own), ## add its URL here. All requests made to images under /uploads/images ## will be redirected to https://yourhost.tld/uploads/images/ #image_redirect_url: 'https://images.example.org' - + assets: ## Section - ## Serve static assets via the appserver (default=false) + ## Serve static assets via the appserver (default=false). ## This is highly discouraged for production use. Let your reverse ## proxy/webserver do it by serving the files under public/ directly. #serve: false - - ## Upload your assets to S3 (default=false) + + ## Upload your assets to S3 (default=false). #upload: false - + ## Specify an asset host. Ensure it does not have a trailing slash (/). #host: http://cdn.example.org/diaspora - ## Pubsub server (default='https://pubsubhubbub.appspot.com/') + ## Pubsub server (default='https://pubsubhubbub.appspot.com/'). ## Diaspora is only tested against the default pubsub server. ## You probably don't want to uncomment or change this. #pubsub_server: 'https://pubsubhubbub.appspot.com/' - + + ## Logger configuration + logging: ## Section + + logrotate: ## Section + + ## Roll the application log on a daily basis (default=true). + #enable: true + + ## The number of days to keep (default=7) + #days: 7 + + ## Debug logging + debug: ## Section + + ## Enables the debug-logging for SQL (default=false) + ## This logs every SQL-statement! + #sql: true + + ## Enables the federation-debug-log (default=false) + ## This logs all XMLs that are used for the federation + #federation: true + ## Settings affecting how ./script/server behaves. server: ## Section + ## Where the appserver should listen to (default=unix:tmp/diaspora.sock) + #listen: 'unix:tmp/diaspora.sock' + #listen: 'unix:/run/diaspora/diaspora.sock' + listen: '127.0.0.1:3986' - ## The port on which the appserver should listen (default=3000): - port: 3986 + ## Set the path for the PID file of the unicorn master process (default=tmp/pids/web.pid) + #pid: 'tmp/pids/web.pid' - ## Rails environment (default='development') + ## Rails environment (default='development'). ## The environment in which the server should be started by default. - ## Change this if you wish to run a production environment. - rails_environment: 'production' - - ## Write unicorn stderr and stdout log + ## Change this to 'production' if you wish to run a production environment. + #rails_environment: 'development' + + ## Write unicorn stderr and stdout log. #stderr_log: '/usr/local/app/diaspora/log/unicorn-stderr.log' #stdout_log: '/usr/local/app/diaspora/log/unicorn-stdout.log' - - ## Number of Unicorn worker processes (default=2) + + ## Number of Unicorn worker processes (default=2). ## Increase this if you have many users. #unicorn_worker: 2 - ## Number of seconds before a request is aborted (default=90) + ## Number of seconds before a request is aborted (default=90). ## Increase if you get empty responses, or if large image uploads fail. ## Decrease if you're under heavy load and don't care if some ## requests fail. #unicorn_timeout: 90 - - ## Embed a Sidekiq worker inside the unicorn process (default=false) + + ## Embed a Sidekiq worker inside the unicorn process (default=false). ## Useful for minimal Heroku setups. #embed_sidekiq_worker: false - ## Number of Sidekiq worker processes (default=1) + ## Number of Sidekiq worker processes (default=1). ## In most cases it is better to ## increase environment.sidekiq.concurrency instead! #sidekiq_workers: 1 - - ## Settings potentially affecting the privacy of your users + + ## Diaspora has an internal XMPP web-client. If you want to enable the chat + ## functionality or want to use a custom XMPP server, then you should edit + ## the following configuration. + chat: ## Section + + ## Enable the chat service and all its components. + ## + ## Please make sure that you followed the Installation-Instructions first: + ## https://wiki.diasporafoundation.org/Integration/Chat#Installation.2FUpdate + #enabled: true + + ## Custom XMPP server configuration goes here. + server: ## Section + + ## Use the configuration bridge to prosody (default=true). + ## In case you want to run your own server or want to configure + ## prosody on your own, you should disable it. + #enabled: false + + ## Set the directory in which to look for virtual hosts TLS certificates. + #certs: 'config/certs' + + ## XEP-0124 BOSH requests + ## The easiest way of avoiding certificate and mixed-content issues + ## is to use a proxy, e.g.: + ## + ## Apache: https://wiki.diasporafoundation.org/Integration/Chat#Apache2 + ## Nginx: https://wiki.diasporafoundation.org/Integration/Chat#Nginx + ## + ## If you configured your proxy correctly, + ## you should set the proxy option to 'true' + bosh: ## Section + + ## If you'd like to use a proxy, you should set the proxy + ## option to true, otherwise jsxc always tries to + ## connect directly to the port specified below. + #proxy: true + + ## Configure the protocol used to access the BOSH endpoint + #proto: http + + ## Configure the address that prosody should listen on. + #address: '0.0.0.0' + + ## Configure the BOSH port. + #port: 5280 + + ## Configure the bind endpoint. + #bind: '/http-bind' + + ## Specify log behaviour here. + log: ## Section + + ## Log file location. + #info: 'log/prosody.log' + + ## Error log file location. + #error: 'log/prosody.err' + + ## The debug level logs all XML sent and received by the server. + #debug: false + + ## Displays the location of a post in a map. Per default we are using the map + ## tiles of the Heidelberg University (http://giscience.uni-hd.de). + ## You also have the possibility to use the map tiles of https://www.mapbox.com + ## which is probably more reliable. There you have to create an account to get + ## an access token which is limited. If you want to get an unlimited account + ## you can write an email to team@diasporafoundation.org. + ## Please enable mapbox and fill out your access_token. + map: ##Section + + mapbox: + #enabled: false + #access_token: "youraccesstoken" + #style: "mapbox/streets-v9" + + ## Settings potentially affecting the privacy of your users. privacy: ## Section - - ## Include jQuery from jquery.com's CDN (default=true) - ## This can save you some traffic and speeds up load time since most - ## clients already have this one cached. Set this to false if you want - ## the jQuery library to be loaded from your pod's own resources. - #jquery_cdn: true - - ## Google Analytics (disabled by default) - ## Provide a key to enable tracking by Google Analytics + + ## Include jQuery from jquery.com's CDN (default=false). + ## Enabling this can reduce traffic and speed up load time since most + ## clients already have this one cached. When set to false (the default), + ## the jQuery library will be loaded from your pod's own resources. + #jquery_cdn: false + + ## Google Analytics (disabled by default). + ## Provide a key to enable tracking by Google Analytics. #google_analytics_key: - - ## Piwik Tracking (disabled by default) + + ## Piwik Tracking (disabled by default). ## Provide a site ID and the host piwik is running on to enable ## tracking through Piwik. piwik: ## Section @@ -190,73 +305,140 @@ configuration: ## Section #enable: true #host: 'stats.example.org' #site_id: 1 - - ## Mixpanel event tracking (disabled by default) + + ## Mixpanel event tracking (disabled by default). #mixpanel_uid: - - ## Chartbeat tracking (disabled by default) + + ## Chartbeat tracking (disabled by default). #chartbeat_uid: - + ## Statistics ## Your pod will report its name, software version and whether ## or not registrations are open via /statistics.json. - ## Uncomment the options below to enable more statistics. + ## Uncomment the options below to enable more statistics. statistics: ## Section - ## Local user total and 6 month active counts + ## Local user total and 6 month active counts. #user_counts: true - ## Local post total count + ## Local post total count. #post_counts: true #comment_counts: true - + + ## Use Camo to proxy embedded remote images. + ## Do not enable this setting unless you have a working Camo setup. Using + ## camo to proxy embedded images will improve the privacy and security of + ## your pod's frontend, but it will increase the traffic on your server. + ## Check out https://wiki.diasporafoundation.org/Installation/Camo for + ## more details and installation instructions. + camo: ## Section + + ## Proxy images embedded via markdown (default=false). + ## Embedded images are quite often from non-SSL sites and may cause a + ## partial content warning, so this is recommended. + #proxy_markdown_images: true + + ## Proxy Open Graph thumbnails (default=false). + ## Open Graph thumbnails may or may not be encrypted and loaded from + ## servers outside the network. Recommended. + #proxy_opengraph_thumbnails: true + + ## Proxy remote pod's images (default=false). + ## Profile pictures and photos from other pods usually are encrypted, + ## so enabling this is only useful if you want to avoid HTTP requests to + ## third-party servers. This will create a lot of traffic on your camo + ## instance. You have been warned. + #proxy_remote_pod_images: true + + ## Root of your Camo installation + #root: "https://example.com/camo/" + + ## Shared key of your Camo installation + #key: "example123example456example!" + ## General settings settings: ## Section - + ## Pod name (default="diaspora*") ## The pod name displayed in various locations, including the header. #pod_name: "diaspora*" ## Allow registrations (default=true) - ## Set this to false to prevent people from signing up for your pod + ## Set this to false to prevent people from signing up to your pod ## without an invitation. Note that this needs to be set to true ## (or commented out) to enable the first registration (you). #enable_registrations: true - + ## Auto-follow on sign-up (default=true) ## Users will automatically follow a specified account on creation. ## Set this to false if you don't want your users to automatically ## follow an account upon creation. #autofollow_on_join: true - - ## Auto-follow account (default='diasporahq@joindiaspora.com') + + ## Auto-follow account (default='hq@pod.diaspora.software') ## The diaspora* HQ account keeps users up to date with news about Diaspora. ## If you set another auto-follow account (for example your podmin account), ## please consider resharing diaspora* HQ's posts for your pod's users! - #autofollow_on_join_user: 'diasporahq@joindiaspora.com' + #autofollow_on_join_user: 'hq@pod.diaspora.software' + + ## Welcome Message settings + welcome_message: ##Section + + ## Welcome Message on registration (default=false) + ## Send a message to new users after registration + ## to tell them about your pod and how things + ## are handled on it. + #enabled: false + + ## Welcome Message subject (default='Welcome Message') + ## The subject of the conversation that is started + ## by your welcome message. + #subject: "Welcome Message" + + ## Welcome Message text (default='Hello %{username}, welcome to diaspora.') + ## The content of your welcome message. + ## The placeholder "%{username}" will be replaced by the username + ## of the new user. + #text: "Hello %{username}, welcome to diaspora." ## Invitation settings invitations: ## Section - + ## Enable invitations (default=true) ## Set this to false if you don't want users to be able to send invites. #open: true - + ## Number of invitations per invite link (default=25) - ## Every user will see such a link if you have enabled invitations on your pod. + ## Every user will see such a link if you have enabled + ## invitations on your pod. #count: 25 - - ## Paypal donations - ## You can provide the ID of a hosted Paypal button here to allow your users - ## to send donations to help run their pod. If you leave this out your users - ## will see a button to donate to the Diaspora Foundation instead :) - #paypal_hosted_button_id: "change_me" - + + ## Paypal donations (disabled by default) + ## You can set details for a Paypal button here to allow donations + ## towards running the pod. + ## First, enable the function, then set the currency in which you + ## wish to receive donations, and **either** a hosted button id + ## **or** an encrypted key for an unhosted button. + paypal_donations: ## Section + #enable: false + + ## Currency used (USD, EUR...) + #currency: USD + + ## hosted Paypal button id + #paypal_hosted_button_id: "change_me" + ## OR encrypted key of unhosted button + #paypal_unhosted_button_encrypted: "-----BEGIN PKCS7-----" + + ## Liberapay.com is a free platform which allow donations like patreon + ## Set your username to include your liberapay button + # liberapay_username: "change_me" + ## Bitcoin donations ## You can provide a bitcoin address here to allow your users to provide ## donations towards the running of their pod. #bitcoin_address: "change_me" - + ## Community spotlight (disabled by default) ## The community spotlight shows new users public posts from people you ## think are interesting in Diaspora's community. To add an account @@ -268,12 +450,12 @@ configuration: ## Section ## E-mail address to which users can make suggestions about who ## should be in the community spotlight (optional). #suggest_email: 'admin@example.org' - + ## CURL debug (default=false) ## Turn on extra verbose output when sending stuff. Note: you ## don't need to touch this unless explicitly told to. #typhoeus_verbose: false - + ## Maximum number of parallel HTTP requests made to other pods (default=20) ## Be careful, raising this setting will heavily increase the memory usage ## of your Sidekiq workers. @@ -289,20 +471,20 @@ configuration: ## Section ## Captcha image size (default='120x20') #image_size: '120x20' - ## Length of captcha text (default=5) + ## Length of captcha text (default=5)(max=12) #captcha_length: 5 ## Captcha image style (default='simply_green') ## Available options for captcha image styles are: 'simply_blue', ## 'simply_red' 'simply_green', 'charcoal_grey', 'embossed_silver', - ## 'all_black', 'distorted_black', 'almost_invisible', 'random' + ## 'all_black', 'distorted_black', 'almost_invisible', 'random'. #image_style: 'simply_green' ## Captcha image distortion (default='low') ## Sets the level of image distortion used in the captcha. - ## Available options are: 'low', 'medium', 'high', 'random' + ## Available options are: 'low', 'medium', 'high', 'random'. #distortion: 'low' - + ## Terms of Service ## Show a default or customized terms of service for users. ## You can create a custom Terms of Service by placing a template @@ -317,8 +499,10 @@ configuration: ## Section ## can communicate to users easily via the diaspora* server software. ## Uncomment to enable this feature. terms: ## Section - # First enable it by uncommenting + + ## First enable it by uncommenting below. #enable: true + ## Important! If you enable the terms, you should always ## set a location under which laws any disputes are governed ## under. For example, country or state/country, depending @@ -326,57 +510,129 @@ configuration: ## Section ## If this is not set, the whole paragraph about governing ## laws *is not shown* in the terms page. #jurisdiction: "" - ## Age limit for signups + + ## Age limit for signups. ## Set a number to activate this setting. This age limit is shown ## in the default ToS document. #minimum_age: false - ## Posting from Diaspora to external services (all are disabled by default) + ## Maintenance + ## Various pod maintenance related settings are controlled from here. + maintenance: ## Section + + ## Removing old inactive users can be done automatically by background + ## processing. The amount of inactivity is set by `after_days`. A warning + ## email will be sent to the user and after an additional `warn_days`, the + ## account will be automatically closed. + ## This maintenance is not enabled by default. + remove_old_users: ## Section + + #enable: true + #after_days: 730 + #warn_days: 30 + + ## Limit queuing for removal per day. + #limit_removals_to_per_day: 100 + + ## Source code URL + ## URL to the source code your pod is currently running. + ## If not set your pod will provide a downloadable archive. + #source_url: 'https://example.org/username/diaspora' + + ## Changelog URL + ## URL to the changelog of the diaspora-version your pod is currently running. + ## If not set an auto-generated url to github is used. + #changelog_url: "https://github.com/diaspora/diaspora/blob/master/Changelog.md" + + ## Default color theme + ## You can change which color theme is displayed when a user is not signed in + ## or has not selected any color theme from the available ones. You simply have + ## to enter the name of the theme's folder in "app/assets/stylesheets/color_themes/". + ## ("original" for the theme in "app/assets/stylesheets/color_themes/original/", for + ## example). + #default_color_theme: "original" + + ## Default meta tags + ## You can change here the default meta tags content included on the pages of your pod. + ## Title will be used for the opengraph og:site_name property while description will be used + ## for description and og:description. + default_metas: + #title: 'diaspora* social network' + #description: 'diaspora* is the online social world where you are in control.' + + ## CSP (Content Security Policy) header + ## CSP allows limiting origins from where resources are allowed to be loaded. This + ## improves security, since it helps to detect and mitigate cross-site scripting + ## and data injection attacks. The default policy of diaspora* allows all third + ## party domains from services that are included in diaspora*, like OEmbed + ## scripts, so you can safely activate it by setting `report_only` to false. If + ## you customized diaspora* (edited templates or added own JS), additional work + ## may be required. You can test the policy with the "report_uri". Our default CSP + ## does not work with Google analytics or Piwik, because they inject JS code that + ## is blocked by CSP. + csp: + ## Report-Only header (default=true) + ## By default diaspora* adds only a "Content-Security-Policy-Report-Only" header. If you set + ## this to false, the "Content-Security-Policy" header is added instead. + #report_only: false + + ## CSP report URI (default=) + ## You can set an URI here, where the user agent reports violations as JSON document via a POST request. + #report_uri: "/csp_violation_reports" + + ## Posting from Diaspora to external services (all are disabled by default). services: ## Section - ## OAuth credentials for Facebook: + ## OAuth credentials for Facebook facebook: ## Section #enable: true #app_id: 'abcdef' #secret: 'change_me' - - ## OAuth credentials for Twitter: + + ## This setting is required to define whether the Facebook app has permissions to post + ## false == No permissions (default) + ## true == Permissions for all users to post. App MUST have 'publish_actions' approved by Facebook! + ## "username" == Set to local username to allow a single user to cross-post. The person who has created + ## the Facebook app will always be able to cross-post, even without 'publish_actions'. + #authorized: false + + ## OAuth credentials for Twitter twitter: ## Section #enable: true #key: 'abcdef' #secret: 'change_me' - + ## OAuth credentials for Tumblr tumblr: ## Section #enable: true #key: 'abcdef' #secret: 'change_me' - + ## OAuth credentials for Wordpress wordpress: ## Section #enable: true #client_id: 'abcdef' #secret: 'change_me' - - ## Enable pod users to send e-mails from Diaspora (disabled by default) + + ## Allow your pod to send emails for notifications, password recovery + ## and other purposes (disabled by default). mail: ## Section - + ## First you need to enable it. #enable: true - - ## Sender address used in mail sent by Diaspora + + ## Sender address used in mail sent by Diaspora. #sender_address: 'no-reply@example.org' - + ## This selects which mailer should be used. Use 'smtp' for a smtp - ## connection, 'sendmail' to use the sendmail binary or - ## 'messagebus' to use the messagebus service. + ## connection or 'sendmail' to use the sendmail binary. #method: 'smtp' - - ## Ignore if method isn't 'smtp' + + ## Ignore if method isn't 'smtp'. smtp: ## Section ## Host and port of the smtp server handling outgoing mail. @@ -384,59 +640,89 @@ configuration: ## Section ## the SMTP server, if it sends one. (default port=587) #host: 'smtp.example.org' #port: 587 - - ## Authentication required to send mail (default='plain') + + ## Authentication required to send mail (default='plain'). ## Use one of 'plain', 'login' or 'cram_md5'. Use 'none' ## if server does not support authentication. #authentication: 'plain' - - ## Credentials to log in to the SMTP server + + ## Credentials to log in to the SMTP server. ## May be necessary if authentication is not 'none'. #username: 'change_me' #password: 'change_me' - - ## Automatically enable TLS (default=true) + + ## Automatically enable TLS (default=true). ## Leave this commented out if authentication is set to 'none'. #starttls_auto: true - - ## The domain for the HELO command, if needed + + ## The domain for the HELO command, if needed. #domain: 'smtp.example.org' - - ## OpenSSL verify mode used when connecting to a SMTP server with TLS + + ## OpenSSL verify mode used when connecting to a SMTP server with TLS. ## Set this to 'none' if you have a self-signed certificate. Possible - ## values: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'. + ## values: 'none', 'peer'. #openssl_verify_mode: 'none' - + ## Ignore if method isn't 'sendmail' sendmail: ## Section ## The path to the sendmail binary (default='/usr/sbin/sendmail') #location: '/usr/sbin/sendmail' - + ## Use exim and sendmail (default=false) #exim_fix: false - - ## Ignore if method isn't 'messagebus' - #message_bus_api_key: 'abcdef' - + ## Administrator settings admins: ## Section - - ## Set the admin account + + ## Set the admin account. ## This doesn't make the user an admin but is used when a generic ## admin contact is needed, much like the postmaster role in mail ## systems. Set only the username, NOT the full ID. #account: "podmaster" - ## E-mail address to contact the administrator + ## E-mail address to contact the administrator. #podmin_email: 'podmin@example.org' - + + ## Settings related to relays + relay: ## Section + + ## Relays are applications that exist to push public posts around to + ## pods which want to subscribe to them but would not otherwise + ## receive them due to not having direct contact with the remote pods. + ## + ## See more regarding relays: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts + + outbound: ## Section + ## Enable this setting to send out public posts from this pod to a relay + #send: false + ## Change default remote relay url used for sending out here + #url: 'https://relay.iliketoast.net/receive/public' + + inbound: ## Section + ## Enable this to receive public posts from relays + #subscribe: false + + ## Scope is either 'all' or 'tags' (default). + ## - 'all', means this pod wants to receive all public posts from a relay + ## - 'tags', means this pod wants only posts tagged with certain tags + #scope: tags + + ## If scope is 'tags', should we include tags that users on this pod follow? + ## These are added in addition to 'pod_tags', if set. + #include_user_tags: false + + ## If scope is 'tags', a comma separated list of tags here can be set. + ## For example "linux,diaspora", to receive posts related to these tags + #pod_tags: + ## Here you can override settings defined above if you need ## to have them different in different environments. production: ## Section environment: ## Section - #redis_url: 'redis://production.example.org:6379' - + #redis: 'redis://production.example.org:6379' + development: ## Section environment: ## Section - #redis_url: 'redis://production.example.org:6379' + #redis: 'redis://production.example.org:6379' + diff --git a/scripts/install b/scripts/install index e6563d1..4e0aa31 100755 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,7 @@ then sudo su -c "echo '$DIASPORASUDOERSCONF' >> /etc/sudoers" fi -sudo su - diaspora -c "rvm install 2.1" +sudo su - diaspora -c "rvm install 2.3" sudo su - diaspora -c "env REALLY_GEM_UPDATE_SYSTEM=1 gem update --system --no-user-install" sudo su - diaspora -c "x=1; RET=1; while [ \$x -le 5 ] && [ \"\$RET\" != 0 ] ; do gem install bundler ; RET=\$? ; x=\$(( \$x + 1 )) ; done" @@ -87,9 +87,13 @@ then fi # construct diaspora app -sudo su - diaspora -c "RAILS_ENV=production bundle install --without test development --retry 10" -sudo su - diaspora -c "RAILS_ENV=production bundle exec rake db:create db:schema:load" -sudo su - diaspora -c "RAILS_ENV=production bundle exec rake assets:precompile" +#sudo su - diaspora -c "RAILS_ENV=production bundle install --without test development --with mysql --retry 10" +#sudo su - diaspora -c "RAILS_ENV=production bundle exec rake db:create db:schema:load" +#sudo su - diaspora -c "RAILS_ENV=production bundle exec rake assets:precompile" +sudo su - diaspora -c "gem install bundler" +sudo su - diaspora -c "RAILS_ENV=production bin/bundle install --jobs $(nproc) --deployment --without test development --with mysql --retry 10" +sudo su - diaspora -c "RAILS_ENV=production bin/rake db:create db:schema:load" +sudo su - diaspora -c "RAILS_ENV=production bin/rake assets:precompile" cd $ori_path